fix: use of directory variable and js issues (#84)

Author: Exeloo

package.json

@@ -69,6 +69,7 @@
     "rxjs": "catalog:schematics"
   },
   "devDependencies": {
+    "@angular-devkit/schematics-cli": "^21.2.2",
     "@commitlint/cli": "catalog:ci",
     "@commitlint/config-conventional": "catalog:ci",
     "@favware/cliff-jumper": "catalog:ci",

pnpm-lock.yaml

@@ -4,27 +4,27 @@ catalogs:
     tsup: ^8.5.1
     typescript: ^5.9.3
   ci:
-    '@commitlint/cli': ^20.4.2
-    '@commitlint/config-conventional': ^20.4.2
+    '@commitlint/cli': ^20.4.4
+    '@commitlint/config-conventional': ^20.4.4
     '@favware/cliff-jumper': ^6.0.0
-    '@nanoforge-dev/actions': ^1.1.0
+    '@nanoforge-dev/actions': ^1.2.3
     husky: ^9.1.7
-    lint-staged: ^16.2.7
+    lint-staged: ^16.4.0
   core:
-    '@types/node': ^25.3.2
+    '@types/node': ^25.5.0
   lint:
     '@nanoforge-dev/utils-eslint-config': ^1.0.2
     '@nanoforge-dev/utils-prettier-config': ^1.0.2
     '@trivago/prettier-plugin-sort-imports': ^6.0.2
-    eslint: ^10.0.2
+    eslint: ^10.0.3
     prettier: ^3.8.1
   schematics:
-    '@angular-devkit/core': ^21.2.0
-    '@angular-devkit/schematics': ^21.2.0
+    '@angular-devkit/core': ^21.2.2
+    '@angular-devkit/schematics': ^21.2.2
     rxjs: ^7.8.2
   tests:
-    '@vitest/coverage-v8': ^4.0.18
-    vitest: ^4.0.18
+    '@vitest/coverage-v8': ^4.1.0
+    vitest: ^4.1.0
 
 onlyBuiltDependencies:
   - esbuild

pnpm-workspace.yaml

@@ -1,4 +1,4 @@
-import { type Path, join, strings } from "@angular-devkit/core";
+import { type Path, join, normalize, strings } from "@angular-devkit/core";
 import {
   type Rule,
   type SchematicContext,
@@ -49,7 +49,7 @@ const generate = (options: ApplicationOptions, path: string): Source => {
       ...strings,
       ...options,
     }),
-    move(path),
+    move(normalize(path)),
   ]);
 };
 

src/libs/application/application.factory.ts

@@ -1,4 +1,4 @@
-import { type Path, join, strings } from "@angular-devkit/core";
+import { type Path, join, normalize, strings } from "@angular-devkit/core";
 import {
   type Rule,
   type Source,
@@ -14,20 +14,24 @@ import {
 
 import { ConfigDeclarator } from "@utils/config/config.declarator";
 import { ConfigFinder } from "@utils/config/config.finder";
-import { toKebabCase } from "@utils/formatting";
-import { resolvePackageName } from "@utils/name";
-
-import { DEFAULT_APP_NAME } from "~/defaults";
 
 import { type ConfigurationOptions } from "./configuration.options";
 import { type ConfigurationSchema } from "./configuration.schema";
 
 const transform = (schema: ConfigurationSchema): ConfigurationOptions => {
-  return {
+  const res: ConfigurationOptions = {
     server: {
       enable: schema.server ?? false,
     },
   };
+
+  if (schema.language === "js") {
+    res["client"] = { build: { entryFile: "client/main.js" } };
+    if (schema.server && "server" in res && res.server)
+      res.server["build"] = { entryFile: "server/main.js" };
+  }
+
+  return res;
 };
 
 const generate = (options: ConfigurationOptions, path: string): Source => {
@@ -36,7 +40,7 @@ const generate = (options: ConfigurationOptions, path: string): Source => {
       ...strings,
       ...options,
     }),
-    move(path),
+    move(normalize(path)),
   ]);
 };
 
@@ -57,9 +61,7 @@ const addConfiguration = (options: ConfigurationOptions, path: Path) => {
 
 export const main = (schema: ConfigurationSchema): Rule => {
   const options = transform(schema);
-  const directory =
-    schema.directory ??
-    resolvePackageName(toKebabCase(schema.name?.toString() ?? DEFAULT_APP_NAME));
+  const directory = schema.directory ?? schema.name;
 
   return branchAndMerge(
     chain([mergeWith(generate(options, directory)), addConfiguration(options, directory as Path)]),

src/libs/configuration/configuration.factory.ts

@@ -13,4 +13,9 @@ export interface ConfigurationSchema {
    * Configure a server for the application
    */
   server?: boolean;
+
+  /**
+   * NanoForge Application language
+   */
+  language?: "js" | "ts";
 }

src/libs/configuration/configuration.schema.d.ts

@@ -21,6 +21,12 @@
       "type": "boolean",
       "description": "Server configuration",
       "default": false
+    },
+    "language": {
+      "type": "string",
+      "enum": ["ts", "js"],
+      "description": "NanoForge application language",
+      "default": "ts"
     }
   },
   "required": ["name"]

src/libs/configuration/schema.json

@@ -1,4 +1,4 @@
-import { type Path, strings } from "@angular-devkit/core";
+import { type Path, normalize, strings } from "@angular-devkit/core";
 import {
   type Rule,
   type Source,
@@ -33,7 +33,7 @@ const generate = (options: DockerOptions, path: string): Source => {
       ...strings,
       ...options,
     }),
-    move(path),
+    move(normalize(path)),
   ]);
 };
 

src/libs/docker/docker.factory.ts

@@ -10,9 +10,9 @@
     {
       "id": "ecsLibrary",
       "type": "component-system",
-      "name": "ECSLibrary",
-      "path": "@nanoforge-dev/ecs",
-      "params": ["\"client\""]
+      "name": "ECSClientLibrary",
+      "path": "@nanoforge-dev/ecs-client",
+      "params": []
     },
     {
       "id": "graphicsLibrary",
@@ -34,7 +34,14 @@
       "name": "MusicLibrary",
       "path": "@nanoforge-dev/music",
       "params": []
-    },<%= !server ? "" : "\n    {\n      \"id\": \"networkLibrary\",\n      \"type\": \"network\",\n      \"name\": \"NetworkClientLibrary\",\n      \"path\": \"@nanoforge-dev/network-client\",\n      \"params\": []\n    }," %>
+    },<% if (server) { %>
+    {
+      "id": "networkLibrary",
+      "type": "network",
+      "name": "NetworkClientLibrary",
+      "path": "@nanoforge-dev/network-client",
+      "params": []
+    },<% } %>
     {
       "id": "soundLibrary",
       "type": "sound",

src/libs/part-base/files/js/__nanoforgeFolder__/client.save.json

@@ -10,10 +10,17 @@
     {
       "id": "ecsLibrary",
       "type": "component-system",
-      "name": "ECSLibrary",
-      "path": "@nanoforge-dev/ecs",
-      "params": ["\"server\""]
-    }<%= !server ? "" : ",\n    {\n      \"id\": \"networkLibrary\",\n      \"type\": \"network\",\n      \"name\": \"NetworkServerLibrary\",\n      \"path\": \"@nanoforge-dev/network-server\",\n      \"params\": []\n    }" %>
+      "name": "ECSServerLibrary",
+      "path": "@nanoforge-dev/ecs-server",
+      "params": []
+    }<% if (server) { %>,
+    {
+      "id": "networkLibrary",
+      "type": "network",
+      "name": "NetworkServerLibrary",
+      "path": "@nanoforge-dev/network-server",
+      "params": []
+    }<% } %>
   ],
   "components": [
     {