@apso/cli 0.0.5 → 0.0.43

package/dist/tests/templates/entities/types/varchar-template.spec.js

@@ -0,0 +1,102 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const template_test_utils_1 = require("../utils/template-test-utils");
+const globals_1 = require("@jest/globals");
+(0, globals_1.describe)('Varchar Entity Template Tests', () => {
+    // Setup Eta configuration once before all tests
+    (0, globals_1.beforeAll)(() => {
+        (0, template_test_utils_1.configureEta)();
+    });
+    const templatePath = './entities/entity-col-varchar';
+    const testCases = [
+        {
+            name: 'should render basic varchar field correctly',
+            field: {
+                name: 'name',
+                dataType: 'string',
+                nullable: false
+            },
+            assertions: [
+                { type: 'contains', text: '@IsOptional({ groups: [UPDATE] })' },
+                { type: 'contains', text: '@IsNotEmpty({ groups: [CREATE] })' },
+                { type: 'contains', text: '@Column({ type: "varchar", length: 255' },
+                { type: 'contains', text: 'nullable: false' },
+                { type: 'contains', text: 'name: string;' },
+                { type: 'notContains', text: '@Index()' },
+                { type: 'notContains', text: '@IsEmail' }
+            ]
+        },
+        {
+            name: 'should render nullable varchar field correctly',
+            field: {
+                name: 'description',
+                dataType: 'string',
+                nullable: true
+            },
+            assertions: [
+                { type: 'contains', text: '@IsOptional({ groups: [UPDATE] })' },
+                { type: 'contains', text: '@Column({ type: "varchar"' },
+                { type: 'contains', text: 'nullable: true' },
+                { type: 'contains', text: 'description: string;' },
+                { type: 'notContains', text: '@IsNotEmpty' }
+            ]
+        },
+        {
+            name: 'should render varchar field with custom length correctly',
+            field: {
+                name: 'code',
+                dataType: 'string',
+                nullable: false,
+                length: 50
+            },
+            assertions: [
+                { type: 'contains', text: '@Column({ type: "varchar", length: 50' },
+                { type: 'contains', text: 'code: string;' }
+            ]
+        },
+        {
+            name: 'should render unique varchar field correctly',
+            field: {
+                name: 'username',
+                dataType: 'string',
+                nullable: false,
+                unique: true
+            },
+            assertions: [
+                { type: 'contains', text: '@Column({ type: "varchar"' },
+                { type: 'contains', text: 'unique: true' },
+                { type: 'contains', text: 'username: string;' }
+            ]
+        },
+        {
+            name: 'should render email field correctly',
+            field: {
+                name: 'email',
+                dataType: 'string',
+                nullable: false,
+                // eslint-disable-next-line camelcase
+                is_email: true
+            },
+            assertions: [
+                { type: 'contains', text: '@IsEmail({ require_tld: false }, { always: true })' },
+                { type: 'contains', text: '@Column({ type: "varchar"' },
+                { type: 'contains', text: 'email: string;' }
+            ]
+        },
+        {
+            name: 'should render indexed varchar field correctly',
+            field: {
+                name: 'indexedField',
+                dataType: 'string',
+                nullable: false,
+                index: true
+            },
+            assertions: [
+                { type: 'contains', text: '@Column({ type: "varchar"' },
+                { type: 'contains', text: '@Index()' },
+                { type: 'contains', text: 'indexedField: string;' }
+            ]
+        }
+    ];
+    (0, template_test_utils_1.runTemplateTests)(templatePath, testCases);
+});

package/dist/tests/templates/entities/types/xml-template.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/tests/templates/entities/types/xml-template.spec.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const template_test_utils_1 = require("../utils/template-test-utils");
+const globals_1 = require("@jest/globals");
+(0, globals_1.describe)('XML Entity Template Tests', () => {
+    // Setup Eta configuration once before all tests
+    (0, globals_1.beforeAll)(() => {
+        (0, template_test_utils_1.configureEta)();
+    });
+    const templatePath = './entities/entity-col-xml';
+    const testCases = [
+        {
+            name: 'should render basic xml field correctly',
+            field: {
+                name: 'xmlContent',
+                dataType: 'string',
+                nullable: false
+            },
+            assertions: [
+                { type: 'contains', text: '@Column({ "type": "xml"' },
+                { type: 'contains', text: 'xmlContent: string;' },
+                { type: 'notContains', text: '@Index()' },
+                { type: 'notContains', text: '@PrimaryColumn()' }
+            ]
+        },
+        {
+            name: 'should render nullable xml field correctly',
+            field: {
+                name: 'optionalXml',
+                dataType: 'string',
+                nullable: true
+            },
+            assertions: [
+                { type: 'contains', text: '@Column({ "type": "xml"' },
+                { type: 'contains', text: 'nullable: true' },
+                { type: 'contains', text: 'optionalXml: string;' }
+            ]
+        },
+        {
+            name: 'should render indexed xml field correctly',
+            field: {
+                name: 'indexedXml',
+                dataType: 'string',
+                nullable: false,
+                index: true
+            },
+            assertions: [
+                { type: 'contains', text: '@Column({ "type": "xml"' },
+                { type: 'contains', text: '@Index()' },
+                { type: 'contains', text: 'indexedXml: string;' }
+            ]
+        }
+    ];
+    (0, template_test_utils_1.runTemplateTests)(templatePath, testCases);
+});

package/dist/tests/templates/entities/utils/template-test-utils.d.ts

@@ -0,0 +1,31 @@
+/**
+ * Configures Eta for template testing
+ * @returns {void} Nothing
+ */
+export declare function configureEta(): void;
+/**
+ * Renders a template file with the given field data
+ * @param templatePath The relative path to the template file
+ * @param field The field data to render the template with
+ * @returns {Promise<string|undefined>} The rendered template
+ */
+export declare function renderTemplate(templatePath: string, field: any): Promise<string | undefined>;
+/**
+ * Common test cases for entity templates
+ */
+export interface TemplateTestCase {
+    name: string;
+    field: any;
+    assertions: Array<{
+        type: 'contains' | 'notContains';
+        text: string;
+    }>;
+}
+/**
+ * Run common test cases for a template
+ *
+ * @param templatePath Path to the template to test
+ * @param testCases Array of test cases
+ * @returns {void} Nothing
+ */
+export declare function runTemplateTests(templatePath: string, testCases: TemplateTestCase[]): void;

package/dist/tests/templates/entities/utils/template-test-utils.js

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runTemplateTests = exports.renderTemplate = exports.configureEta = void 0;
+const tslib_1 = require("tslib");
+const Eta = tslib_1.__importStar(require("eta"));
+const path = tslib_1.__importStar(require("path"));
+const globals_1 = require("@jest/globals");
+/**
+ * Configures Eta for template testing
+ * @returns {void} Nothing
+ */
+function configureEta() {
+    Eta.configure({
+        views: path.join(__dirname, '../../../../lib/templates'),
+    });
+}
+exports.configureEta = configureEta;
+/**
+ * Renders a template file with the given field data
+ * @param templatePath The relative path to the template file
+ * @param field The field data to render the template with
+ * @returns {Promise<string|undefined>} The rendered template
+ */
+async function renderTemplate(templatePath, field) {
+    return Eta.renderFileAsync(templatePath, { field });
+}
+exports.renderTemplate = renderTemplate;
+/**
+ * Run common test cases for a template
+ *
+ * @param templatePath Path to the template to test
+ * @param testCases Array of test cases
+ * @returns {void} Nothing
+ */
+function runTemplateTests(templatePath, testCases) {
+    testCases.forEach(testCase => {
+        (0, globals_1.it)(testCase.name, async () => {
+            const rendered = await renderTemplate(templatePath, testCase.field);
+            for (const assertion of testCase.assertions) {
+                if (assertion.type === 'contains') {
+                    (0, globals_1.expect)(rendered).toContain(assertion.text);
+                }
+                else {
+                    (0, globals_1.expect)(rendered).not.toContain(assertion.text);
+                }
+            }
+        });
+    });
+}
+exports.runTemplateTests = runTemplateTests;

package/oclif.manifest.json

@@ -1 +1,60 @@
-{"version":"0.0.5","commands":{"new":{"id":"new","description":"Initialize your server or client project","pluginName":"@apso/cli","pluginType":"core","aliases":[],"examples":["$ apso new --web\nhello world from ./src/hello.ts!\n"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"name":{"name":"name","type":"option","char":"n","description":"name of application"},"web":{"name":"web","type":"boolean","char":"w","description":"initialize web application","allowNo":false},"server":{"name":"server","type":"boolean","char":"s","description":"initialize server application","allowNo":false},"serverless":{"name":"serverless","type":"boolean","char":"S","description":"initialize serverless application","allowNo":false},"force":{"name":"force","type":"boolean","char":"f","allowNo":false}},"args":[{"name":"web"},{"name":"server"},{"name":"serverless"},{"name":"name"}]},"scaffold":{"id":"scaffold","description":"Create new models for Server or Client","pluginName":"@apso/cli","pluginType":"core","aliases":[],"examples":["$ apso scaffold\nhello world from ./src/hello.ts!\n"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"entity":{"name":"entity","type":"option","char":"m","description":"model name"},"web":{"name":"web","type":"boolean","char":"w","description":"initialize web application","allowNo":false},"server":{"name":"server","type":"boolean","char":"s","description":"initialize server application","allowNo":false}},"args":[{"name":"web"},{"name":"server"},{"name":"entity"}]}}}
+{
+  "version": "0.0.43",
+  "commands": {
+    "server:new": {
+      "id": "server:new",
+      "description": "Initialize your server project",
+      "strict": true,
+      "pluginName": "@apso/cli",
+      "pluginAlias": "@apso/cli",
+      "pluginType": "core",
+      "aliases": [],
+      "examples": [
+        "$ apso server new --name TestProject"
+      ],
+      "flags": {
+        "name": {
+          "name": "name",
+          "type": "option",
+          "char": "n",
+          "description": "name of application",
+          "multiple": false
+        },
+        "type": {
+          "name": "type",
+          "type": "option",
+          "char": "t",
+          "description": "api type (rest or graphql)",
+          "multiple": false
+        }
+      },
+      "args": {
+        "name": {
+          "name": "name"
+        }
+      }
+    },
+    "server:scaffold": {
+      "id": "server:scaffold",
+      "description": "Setup new entities and interfaces for an Apso Server",
+      "strict": true,
+      "pluginName": "@apso/cli",
+      "pluginAlias": "@apso/cli",
+      "pluginType": "core",
+      "aliases": [],
+      "examples": [
+        "$ apso server scaffold"
+      ],
+      "flags": {
+        "help": {
+          "name": "help",
+          "type": "boolean",
+          "char": "h",
+          "description": "Show CLI help.",
+          "allowNo": false
+        }
+      },
+      "args": {}
+    }
+  }
+}

package/package.json

@@ -1,74 +1,103 @@
 {
   "name": "@apso/cli",
-  "version": "0.0.5",
-  "author": "Matt Cullerton",
-  "publishConfig": {
-    "access": "public"
-  },
+  "version": "0.0.43",
+  "description": "Apso CLI",
+  "author": "Apso by Mavric - @mavric",
   "bin": {
     "apso": "./bin/run"
   },
-  "bugs": "https://github.com/mavric/apso/issues",
-  "dependencies": {
-    "@oclif/command": "^1",
-    "@oclif/config": "^1",
-    "@oclif/plugin-help": "^3",
-    "chalk": "^4.0.0",
-    "fs-extra": "^9.0.1",
-    "rc": "^1.2.8",
-    "tslib": "^1",
-    "validate-npm-package-name": "^3.0.0"
-  },
-  "devDependencies": {
-    "@oclif/dev-cli": "^1",
-    "@oclif/test": "^1",
-    "@types/chai": "^4",
-    "@types/chalk": "^2.2.0",
-    "@types/fs-extra": "^9.0.1",
-    "@types/mocha": "^5",
-    "@types/node": "^14.0.13",
-    "@types/rc": "^1.1.0",
-    "@types/validate-npm-package-name": "^3.0.0",
-    "chai": "^4",
-    "eslint": "^5.13",
-    "eslint-config-oclif": "^3.1",
-    "eslint-config-oclif-typescript": "^0.1",
-    "globby": "^10",
-    "mocha": "^5",
-    "nyc": "^14",
-    "ts-node": "^8",
-    "typescript": "^3.3"
+  "homepage": "https://github.com/apsoai/cli",
+  "license": "MIT",
+  "main": "dist/index.js",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/apsoai/cli.git"
   },
-  "engines": {
-    "node": ">=8.0.0"
+  "publishConfig": {
+    "access": "public"
   },
   "files": [
     "/bin",
-    "/lib",
+    "/dist",
     "/npm-shrinkwrap.json",
     "/oclif.manifest.json"
   ],
-  "homepage": "https://github.com/mavric/apso",
-  "keywords": [
-    "oclif"
-  ],
-  "license": "MIT",
-  "main": "lib/index.js",
+  "dependencies": {
+    "@oclif/core": "^2",
+    "@oclif/plugin-help": "^5",
+    "@oclif/plugin-plugins": "^3",
+    "debug": "^4.3.4",
+    "eta": "^2.0.0",
+    "pluralize": "^8.0.0",
+    "rc": "^1.2.8",
+    "shelljs": "^0.8.5"
+  },
+  "devDependencies": {
+    "@jest/globals": "^29.5.0",
+    "@oclif/test": "^2.4.7",
+    "@types/chai": "^4",
+    "@types/mocha": "^10",
+    "@types/node": "^20",
+    "@types/pluralize": "^0.0.29",
+    "@types/rc": "^1.2.1",
+    "@types/shelljs": "^0.8.15",
+    "@typescript-eslint/eslint-plugin": "^5.59.8",
+    "chai": "^4",
+    "copyfiles": "^2.4.1",
+    "eslint": "^7.32.0",
+    "eslint-config-oclif": "^4",
+    "eslint-config-oclif-typescript": "^1.0.3",
+    "eslint-config-prettier": "^8.6.0",
+    "eslint-plugin-unicorn": "^40.1.0",
+    "mocha": "^10",
+    "oclif": "^3",
+    "prettier": "^2.8.4",
+    "shx": "^0.3.3",
+    "ts-jest": "^29.1.0",
+    "ts-node": "^10.9.1",
+    "tslib": "^2.5.0",
+    "typescript": "^5"
+  },
   "oclif": {
-    "commands": "./lib/commands",
     "bin": "apso",
+    "dirname": "apso",
+    "commands": "./dist/commands",
     "plugins": [
-      "@oclif/plugin-help"
-    ]
+      "@oclif/plugin-help",
+      "@oclif/plugin-plugins"
+    ],
+    "topicSeparator": " ",
+    "topics": {
+      "hello": {
+        "description": "Say hello to the world and others"
+      }
+    }
   },
-  "repository": "mavric/apso",
   "scripts": {
-    "postpack": "rm -f oclif.manifest.json",
-    "posttest": "eslint . --ext .ts --config .eslintrc",
-    "prepack": "rm -rf lib && tsc -b && oclif-dev manifest && oclif-dev readme",
-    "test": "nyc --extension .ts mocha --forbid-only \"test/**/*.test.ts\"",
-    "version": "oclif-dev readme && git add README.md"
+    "post-build": "copyfiles -u 1 src/**/*.eta dist/",
+    "build": "shx rm -rf dist && tsc -b && npm run post-build",
+    "lint": "eslint . --ext .ts --config .eslintrc",
+    "format": "prettier \"{src,test}/**/*.ts\" --write",
+    "pre-build": "npm run format && npm run lint",
+    "postpack": "shx rm -f oclif.manifest.json",
+    "pack": "oclif pack tarballs",
+    "posttest": "npm run lint",
+    "prepack": "npm run build && oclif manifest && oclif readme",
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "test:cov": "jest --coverage",
+    "version": "oclif readme && git add README.md"
+  },
+  "engines": {
+    "node": ">=12.0.0"
   },
-  "types": "lib/index.d.ts",
-  "gitHead": "92c8bc381797fd45751dad9dda9700437a9678d8"
+  "bugs": "https://github.com/@apsoai/cli/issues",
+  "keywords": [
+    "apso",
+    "apsoai",
+    "apso-cli",
+    "cli",
+    "oclif"
+  ],
+  "types": "dist/index.d.ts"
 }

package/lib/commands/new.d.ts

@@ -1,22 +0,0 @@
-import { Command, flags } from '@oclif/command';
-export default class Init extends Command {
-    static description: string;
-    static examples: string[];
-    static flags: {
-        help: import("@oclif/parser/lib/flags").IBooleanFlag<void>;
-        name: flags.IOptionFlag<string | undefined>;
-        web: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
-        server: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
-        serverless: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
-        force: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
-    };
-    static args: {
-        name: string;
-    }[];
-    checkAppName(appName: string): Promise<void>;
-    install(root: string, dependencies: string[]): Promise<unknown>;
-    installModules(root: string): Promise<unknown>;
-    startApp(root: string): Promise<unknown>;
-    initFromTemplate(name: string, template: string): Promise<void>;
-    run(): Promise<void>;
-}