@casekit/orm2-cli 1.0.2 → 1.0.4

package/build/commands/generate-model.test.js

@@ -17,7 +17,7 @@ describe("orm generate model", () => {
                     };
                 `,
             "app/db.server/models/user.ts": unindent `
-                    import { ModelDefinition, sql } from "@casekit/orm2";
+                    import { type ModelDefinition, sql } from "@casekit/orm2";
 
                     export const user = {
                         fields: {
@@ -38,7 +38,7 @@ describe("orm generate model", () => {
             .parseAsync("model --name post --fields title:text content:text");
         const modelFile = vol.readFileSync("./app/db.server/models/post.ts", "utf8");
         expect(modelFile.trim()).toEqual(unindent `
-            import { ModelDefinition, sql } from "@casekit/orm2";
+            import { type ModelDefinition, sql } from "@casekit/orm2";
 
             export const post = {
                 fields: {

package/build/generators/generateModelFile.js

@@ -84,14 +84,21 @@ export const generateModelFile = async (opts, { directory }) => {
     const hasSqlLiteral = j(modelDefinition).find(j.TaggedTemplateExpression, {
         tag: { type: "Identifier", name: "sql" },
     }).length > 0;
-    // Build the import statement
-    const importSpecifiers = [
-        j.importSpecifier(j.identifier("ModelDefinition")),
-    ];
+    // Build the import statement by parsing the import code string
+    // to ensure proper TypeScript type-only import syntax
+    let importCode;
     if (hasSqlLiteral) {
-        importSpecifiers.push(j.importSpecifier(j.identifier("sql")));
+        // import { type ModelDefinition, sql }
+        importCode =
+            'import { type ModelDefinition, sql } from "@casekit/orm2";';
     }
-    const importDeclaration = j.importDeclaration(importSpecifiers, j.literal("@casekit/orm2"));
+    else {
+        // import type { ModelDefinition }
+        importCode = 'import type { ModelDefinition } from "@casekit/orm2";';
+    }
+    const importDeclaration = j(importCode)
+        .find(j.ImportDeclaration)
+        .get().node;
     // Build the export statement with type assertion
     const exportDeclaration = j.exportNamedDeclaration(j.variableDeclaration("const", [
         j.variableDeclarator(j.identifier(opts.name), j.tsSatisfiesExpression(j.tsAsExpression(modelDefinition, j.tsTypeReference(j.identifier("const"))), j.tsTypeReference(j.identifier("ModelDefinition")))),

package/build/generators/generateModelFile.test.js

@@ -38,7 +38,7 @@ describe("generateModelFile", () => {
             fields: ["id:serial", "name:text"],
         }, { directory: "./app/db.server" });
         expect(result.trim()).toBe(unindent `
-            import { ModelDefinition, sql } from "@casekit/orm2";
+            import { type ModelDefinition, sql } from "@casekit/orm2";
 
             export const bar = {
                 fields: {
@@ -59,7 +59,7 @@ describe("generateModelFile", () => {
             directory: "./app/db.server",
         });
         expect(result.trim()).toBe(unindent `
-            import { ModelDefinition } from "@casekit/orm2";
+            import type { ModelDefinition } from "@casekit/orm2";
 
             export const foo = {
                 fields: {},

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@casekit/orm2-cli",
   "description": "",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "author": "",
   "bin": {
     "orm": "./build/cli.js"
@@ -17,10 +17,10 @@
     "pluralize": "^8.0.0",
     "tsx": "^4.20.3",
     "yargs": "^18.0.0",
-    "@casekit/orm2": "1.0.2",
-    "@casekit/sql": "1.0.2",
-    "@casekit/toolbox": "1.0.2",
-    "@casekit/orm2-migrate": "1.0.2"
+    "@casekit/orm2": "1.0.4",
+    "@casekit/orm2-migrate": "1.0.4",
+    "@casekit/toolbox": "1.0.4",
+    "@casekit/sql": "1.0.4"
   },
   "devDependencies": {
     "@trivago/prettier-plugin-sort-imports": "^5.2.2",
@@ -39,9 +39,9 @@
     "vite-tsconfig-paths": "^5.1.4",
     "vitest": "^3.2.4",
     "zod": "^4.0.17",
-    "@casekit/orm2-fixtures": "1.0.2",
-    "@casekit/tsconfig": "1.0.2",
-    "@casekit/prettier-config": "1.0.2"
+    "@casekit/orm2-fixtures": "1.0.4",
+    "@casekit/prettier-config": "1.0.4",
+    "@casekit/tsconfig": "1.0.4"
   },
   "exports": {
     ".": "./build/index.js"