db-use-core fix cli

bin/django-builder

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
 
 require = require('esm')(module /*, options*/);
-require('../packages/djangobuilder.io/src/cli').cli(process.argv);
+require('../lib/djangobuilder-core/src/cli').cli(process.argv);

example-project.json

@@ -2,6 +2,7 @@
   "name": "DjangoProject",
   "description": "A Django Project with great potential",
   "htmx": false,
+  "postgres": false,
   "apps": [
     {
       "name": "DjangoApp1",

lib/djangobuilder-core/package.json

@@ -25,6 +25,7 @@
     "lint": "eslint .",
     "fix-lint": "eslint . --fix",
     "smoketest": "npx tsc && npx ts-node src/smoketest.ts",
-    "test": "jest ."
+    "test": "jest .",
+    "cli": "tsc -t es5 src/cli.ts --outDir dist --esModuleInterop && node dist/cli.js render"
   }
 }

lib/djangobuilder-core/src/cli.ts

@@ -0,0 +1,69 @@
+#!/usr/bin/env node
+import DjangoProject, { DjangoApp, DjangoModel, DjangoField, DjangoRelationship } from './api';
+import Renderer from './rendering';
+import { DjangoVersion } from './types';
+
+const args = process.argv.slice(2);
+
+console.log("ARGS", args);
+
+if (args.length === 0) {
+  console.error('No arguments provided.');
+  process.exit(1);
+}
+
+const command = args[0];
+
+switch (command) {
+  case 'render':
+    if (args.length < 2) {
+      console.error('No template provided for rendering.');
+      process.exit(1);
+    }
+    if (args.length < 3) {
+      console.error('No outputfile provided.');
+      process.exit(1);
+    }
+    const input_file = args[1];
+    const output_file = args[2];
+    const projectData = JSON.parse(require('fs').readFileSync(input_file, 'utf8'));
+
+    const projectParams = {
+      channels: projectData.channels || false,
+      htmx: projectData.htmx || false,
+      postgres: projectData.postgres || false,
+      pillow: projectData.pillow || false,
+    }
+    const project = new DjangoProject(
+      projectData.name,
+      projectData.description,
+      projectData.version || DjangoVersion.DJANGO4,
+      projectParams,
+    );
+
+    for (const appData of projectData["apps"]) {
+
+      const djangoApp = new DjangoApp(project, appData.name);
+
+      const models = appData.models.map((modelData: any) => {
+        const model = new DjangoModel(djangoApp, modelData.name, false, []);
+        model.fields.forEach((field: any) => {
+          model.addField(field.name, field.type, field.options);
+        })
+        return model;
+
+      });
+
+      project.addApp(appData.name, models);
+    }
+    console.log("Created Project", project);
+    const renderer = new Renderer();
+    const tarballContent = renderer.tarballContent(project);
+    // write to file
+    require('fs').writeFileSync(output_file, tarballContent);
+    console.log(`Rendered project to ${output_file}`);
+    break;
+  default:
+    console.error(`Unknown command: ${command}`);
+    process.exit(1);
+}

lib/djangobuilder-core/tsconfig.json

@@ -1,6 +1,11 @@
 {
   "extends": "@tsconfig/node16/tsconfig.json",
-  "compilerOptions": {"outDir": "dist"},
+  "compilerOptions": {
+    "rootDir": "src",
+    "moduleResolution": "node",
+    "outDir": "dist",
+    "skipLibCheck": true,
+  },
   "include": ["src"],
   "exclude": ["node_modules"],
 }

script/cli_test.sh

@@ -2,7 +2,9 @@
 
 set -ex
 
-./bin/django-builder example-project.json output.tar
+cd lib/djangobuilder-core
+yarn run cli ../../example-project.json ../../output.tar
+cd ../..
 
 tar -xvf output.tar