structured-fw 0.7.8 → 0.7.9

package/build/system/bin/structured.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export {};

package/build/system/bin/structured.js

@@ -0,0 +1,95 @@
+#!/usr/bin/env node
+import { resolve } from 'path';
+import { cpSync, existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs';
+const cwd = resolve(import.meta.dirname, '..');
+const projectRoot = resolve('.');
+if (process.argv.length < 3) {
+    console.log('Thanks for using the Structured framework.');
+    console.log(`To set up a basic boilerplate in ${projectRoot} run:\n npx structured init`);
+    process.exit();
+}
+const command = process.argv[2];
+function copyIfNotExists(src, dst) {
+    if (typeof dst !== 'string') {
+        dst = src;
+    }
+    if (existsSync(`${cwd}/${src}`) && !existsSync(`${projectRoot}/${dst}`)) {
+        console.log(`Creating ${dst}`);
+        cpSync(`${cwd}/${src}`, `${projectRoot}/${dst}`);
+    }
+}
+function createDir(path) {
+    if (!existsSync(`${projectRoot}/${path}`)) {
+        console.log(`Creating directory ${projectRoot}/${path}`);
+        mkdirSync(`${projectRoot}/${path}`);
+    }
+}
+function createTsconfig() {
+    const tsconfigPath = `${projectRoot}/tsconfig.json`;
+    const exists = existsSync(tsconfigPath);
+    const paths = {
+        "/assets/ts/*": ["./assets/ts/*"],
+        "/assets/client-js/*": ["./system/*"],
+        "@structured/*": [
+            "./node_modules/structured-fw/build/system/server/*",
+            "./node_modules/structured-fw/build/system/client/*",
+            "./node_modules/structured-fw/build/system/*",
+            "./system/server/*",
+            "./system/client/*",
+            "./system/*",
+        ]
+    };
+    if (exists) {
+        console.log('Updating tsconfig.json, adding @structured to compilerOptions.paths');
+        const config = JSON.parse(readFileSync(tsconfigPath).toString());
+        if (!config.compilerOptions) {
+            config.compilerOptions = {};
+        }
+        if (!config.compilerOptions.paths) {
+            config.compilerOptions.paths = paths;
+        }
+        writeFileSync(tsconfigPath, JSON.stringify(config, null, 4));
+    }
+    else {
+        console.log('Creating tsconfig.json');
+        const config = {
+            "compilerOptions": {
+                "noImplicitAny": true,
+                "noUnusedLocals": true,
+                "noImplicitReturns": true,
+                "alwaysStrict": true,
+                "strictNullChecks": true,
+                "strictPropertyInitialization": true,
+                "strictBindCallApply": true,
+                "moduleResolution": "bundler",
+                "outDir": "./build",
+                "module": "ES2020",
+                "target": "ES2021",
+                "allowSyntheticDefaultImports": true,
+                "preserveSymlinks": true,
+                "removeComments": true,
+                "baseUrl": ".",
+                "rootDir": ".",
+                paths
+            },
+            "include": ["./system/**/*", "./app/**/*", "./assets/ts/**/*", "index.ts"]
+        };
+        writeFileSync(tsconfigPath, JSON.stringify(config, null, 4));
+    }
+}
+if (command === 'init') {
+    console.log('Setting up a basic Structured boilerplate...');
+    createDir('app');
+    createDir('app/routes');
+    createDir('app/views');
+    createDir('app/models');
+    createDir('app/lib');
+    copyIfNotExists('index.ts');
+    copyIfNotExists('Config.ts');
+    copyIfNotExists('app/Types.ts');
+    createTsconfig();
+    console.log(`Structured initialized, you can run "tsc" to build`);
+}
+else {
+    console.log(`Command "${command}" not recognized`);
+}

package/package.json

@@ -14,7 +14,7 @@
   "license": "MIT",
   "type": "module",
   "main": "build/index",
-  "version": "0.7.8",
+  "version": "0.7.9",
   "scripts": {
     "develop": "tsc --watch",
     "startDev": "cd build && nodemon --watch '../app/**/*' --watch '../build/**/*' -e js,html,css index.js",
@@ -23,7 +23,7 @@
     "postinstall": "echo \"Run npx structured init\" to create application boilerplate"
   },
   "bin": {
-    "structured": "./bin/structured"
+    "structured": "./build/system/bin/structured"
   },
   "devDependencies": {
     "@types/mime-types": "^2.1.4",

package/{bin/structured → system/bin/structured.ts}

@@ -18,7 +18,7 @@ if (process.argv.length < 3) {
 
 const command = process.argv[2];
 
-function copyIfNotExists(src, dst) {
+function copyIfNotExists(src: string, dst?: string) {
     if (typeof dst !== 'string') {
         dst = src;
     }
@@ -28,7 +28,7 @@ function copyIfNotExists(src, dst) {
     }
 }
 
-function createDir(path) {
+function createDir(path: string) {
     if (! existsSync(`${projectRoot}/${path}`)) {
         console.log(`Creating directory ${projectRoot}/${path}`);
         mkdirSync(`${projectRoot}/${path}`);
@@ -98,14 +98,14 @@ function createTsconfig() {
 
 if (command === 'init') {
     console.log('Setting up a basic Structured boilerplate...');
-    copyIfNotExists('index.ts');
-    copyIfNotExists('Config.ts');
     createDir('app');
     createDir('app/routes');
     createDir('app/views');
     createDir('app/models');
     createDir('app/lib');
-
+    copyIfNotExists('index.ts');
+    copyIfNotExists('Config.ts');
+    copyIfNotExists('app/Types.ts');
     createTsconfig();
 
     console.log(`Structured initialized, you can run "tsc" to build`);