refactor(compiler): reorganize imports

aeria-org · Jan 18, 2025 · 69a49a3 · 69a49a3
1 parent f0ce8fb
commit 69a49a3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/packages/compiler/src/codegen/generateContracts.ts b/packages/compiler/src/codegen/generateContracts.ts
@@ -1,7 +1,7 @@
+import type * as aeria from 'aeria'
+import type * as AST from '../ast.js'
 import { errorSchema, type Property, resultSchema } from 'aeria'
-import type * as AST from '../ast'
-import { getProperties, propertyToSchema, stringify, UnquotedSymbol, type StringifyProperty } from './utils'
-import type aeria from 'aeria'
+import { getProperties, propertyToSchema, stringify, UnquotedSymbol, type StringifyProperty } from './utils.js'
 
 export const generateContracts = (ast: AST.Node[]) => {
   return {

diff --git a/packages/compiler/src/codegen/generateExports.ts b/packages/compiler/src/codegen/generateExports.ts
@@ -1,5 +1,5 @@
-import type * as AST from '../ast'
-import { resizeFirstChar, getExtendName, getCollectionId } from './utils'
+import type * as AST from '../ast.js'
+import { resizeFirstChar, getExtendName, getCollectionId } from './utils.js'
 
 type SymbolToExport = {
   id: string

diff --git a/packages/compiler/src/codegen/generateJSCollections.ts b/packages/compiler/src/codegen/generateJSCollections.ts
@@ -1,7 +1,6 @@
-import { type Collection, type Property } from 'aeria'
-import type * as AST from '../ast'
-import { makeASTImports, getProperties, stringify, aeriaPackageName, getExtendName, getCollectionId, type StringifyProperty, UnquotedSymbol } from './utils'
-import type aeria from 'aeria'
+import type * as aeria from 'aeria'
+import type * as AST from '../ast.js'
+import { makeASTImports, getProperties, stringify, aeriaPackageName, getExtendName, getCollectionId, type StringifyProperty, UnquotedSymbol } from './utils.js'
 
 const initialImportedFunctions = [
   'extendCollection',
@@ -45,10 +44,10 @@ const makeJSCollections = (ast: AST.Node[], modifiedSymbols: Record<string, stri
 }
 
 const makeJSCollectionSchema = (collectionNode: AST.CollectionNode, collectionId: string) => {
-  const collectionSchema: Omit<Collection, 'item' | 'functions'> & { functions?: StringifyProperty } = {
+  const collectionSchema: Omit<aeria.Collection, 'item' | 'functions'> & { functions?: StringifyProperty } = {
     description: {
       $id: collectionId,
-      properties: getProperties(collectionNode.properties) as Record<string, Property>,
+      properties: getProperties(collectionNode.properties) as Record<string, aeria.Property>,
     },
   }
 

diff --git a/packages/compiler/src/codegen/generateTSCollections.ts b/packages/compiler/src/codegen/generateTSCollections.ts
@@ -1,6 +1,6 @@
-import { type Collection, type Property } from 'aeria'
-import type * as AST from '../ast'
-import { getProperties, stringify, makeASTImports, resizeFirstChar, aeriaPackageName, getCollectionId, type StringifyProperty, UnquotedSymbol } from './utils'
+import type { Collection, Property } from 'aeria'
+import type * as AST from '../ast.js'
+import { getProperties, stringify, makeASTImports, resizeFirstChar, aeriaPackageName, getCollectionId, type StringifyProperty, UnquotedSymbol } from './utils.js'
 
 const initialImportedTypes = [
   'Collection',