@akanjs/cli 0.9.55 → 0.9.56

package/cjs/index.js

@@ -2057,9 +2057,10 @@ var Executor = class _Executor {
   async cp(srcPath, destPath) {
     const src = this.getPath(srcPath);
     const dest = this.getPath(destPath);
+    const isDirectory = import_fs4.default.statSync(src).isDirectory();
     if (!import_fs4.default.existsSync(src))
       return;
-    if (!import_fs4.default.existsSync(dest))
+    if (!import_fs4.default.existsSync(dest) && isDirectory)
       await import_promises.default.mkdir(dest, { recursive: true });
     await import_promises.default.cp(src, dest, { recursive: true });
   }

package/cjs/src/templates/__scalar/__model__/__model__.constant.js

@@ -26,7 +26,6 @@ function getContent(scanInfo, dict) {
   return `
 import { via } from "@akanjs/constant";
 
-
 export class ${dict.Model} extends via((field) => ({
   field: field(String),
 })) {}

package/cjs/src/templates/__scalar/__model__/__model__.dictionary.js

@@ -28,7 +28,7 @@ import { ModelDictionary } from "@akanjs/dictionary";
 
 import type { ${dict.Model} } from "./${dict.model}.constant";
 
-export const modelDictionary = {
+export const dictionary = {
   modelName: ["${dict.Model}", "${dict.Model}"],
   modelDesc: ["${dict.Model}", "${dict.Model}"],
 
@@ -40,7 +40,5 @@ export const modelDictionary = {
   // * ==================== Etc ==================== * //
   // * ==================== Etc ==================== * //
 } satisfies ModelDictionary<${dict.Model}>;
-
-export const ${dict.model}Dictionary = modelDictionary;
 `;
 }

package/cjs/src/templates/app/instrumentation.js

@@ -0,0 +1,32 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// pkgs/@akanjs/cli/src/templates/app/instrumentation.ts
+var instrumentation_exports = {};
+__export(instrumentation_exports, {
+  default: () => getContent
+});
+module.exports = __toCommonJS(instrumentation_exports);
+function getContent(scanInfo, dict) {
+  return `
+import { registerClient } from "./client";
+
+export const register = async () => {
+  await registerClient();
+};`;
+}

package/cjs/src/templates/app/lib/___appName__/__appName__.dictionary.js

@@ -25,12 +25,8 @@ module.exports = __toCommonJS(appName_dictionary_exports);
 function getContent(scanInfo, dict) {
   return `
 import type { SignalDictionary } from "@akanjs/dictionary";
-import type { ${dict.AppName}Signal } from "./${dict.appName}.signal";
+import type { ${dict.AppName}Endpoint } from "./${dict.appName}.signal";
 
-const dictionary = {} as const;
-
-export const signalDictionary = {} satisfies SignalDictionary<${dict.AppName}Signal>;
-
-export const ${dict.appName}Dictionary = { ...dictionary, ...signalDictionary };
+export const dictionary = {} satisfies SignalDictionary<${dict.AppName}Endpoint>;
   `;
 }

package/cjs/src/templates/app/lib/___appName__/__appName__.signal.js

@@ -24,10 +24,12 @@ __export(appName_signal_exports, {
 module.exports = __toCommonJS(appName_signal_exports);
 function getContent(scanInfo, dict) {
   return `
-import { signal } from "@akanjs/signal";
+import { endpoint, internal } from "@akanjs/signal";
 
-import * as cnst from "../cnst";
+import * as srv from "../srv";
 
-export class ${dict.AppName}Signal extends signal("${dict.AppName}" as const, cnst.Srvs) {}
+export class ${dict.AppName}Internal extends internal(srv.${dict.appName}, () => ({})) {}
+
+export class ${dict.AppName}Endpoint extends endpoint(srv.${dict.appName}, () => ({})) {}
   `;
 }

package/cjs/src/templates/module/__model__.dictionary.js

@@ -83,7 +83,5 @@ export const signalDictionary = {
   "argdesc-${dict.model}InsightInPublic-statuses": ["Statuses to filter", "\uD544\uD130\uB9C1\uD560 \uC0C1\uD0DC"],
   // * ==================== Endpoint ==================== * //
 } satisfies SignalDictionary<${dict.Model}Signal, ${dict.Model}>;
-
-export const ${dict.model}Dictionary = { ...modelDictionary, ...signalDictionary };
 `;
 }

package/cjs/src/templates/module/__model__.document.js

@@ -28,9 +28,14 @@ import { beyond, by, into, type SchemaOf } from "@akanjs/document";
 
 import * as cnst from "../cnst";
 
+export class ${dict.Model}Filter extends from(cnst.${dict.Model}, (filter) => ({
+  query: {},
+  sort: {},
+})) {}
+
 export class ${dict.Model} extends by(cnst.${dict.Model}) {}
 
-export class ${dict.Model}Model extends into(${dict.Model}, cnst.${dict.model}) {}
+export class ${dict.Model}Model extends into(${dict.Model}, ${dict.Model}Filter, cnst.${dict.model}) {}
 
 export class ${dict.Model}Middleware extends beyond(${dict.Model}Model, ${dict.Model}) {
   onSchema(schema: SchemaOf<${dict.Model}Model, ${dict.Model}>) {

package/cjs/src/templates/module/__model__.signal.js

@@ -24,36 +24,21 @@ __export(model_signal_exports, {
 module.exports = __toCommonJS(model_signal_exports);
 function getContent(scanInfo, dict) {
   return `
-import { Int } from "@akanjs/base";
-import type { SortOf } from "@akanjs/document";
-import { Arg, signal, Mutation, Query, resolve } from "@akanjs/signal";
+import { endpoint, internal, slice } from "@akanjs/signal";
 
 import * as cnst from "../cnst";
+import * as srv from "../srv";
 
-export class ${dict.Model}Signal extends signal(cnst.${dict.model}, cnst.Srvs, {
-  guards: { get: "Public", cru: "Public },
-}) {
-  // * /////////////////////////////////////
-  // * Public Slice
-  @Query.Public(() => [cnst.${dict.Model}])
-  async ${dict.model}ListInPublic(
-    @Arg.Query("statuses", () => [String], { nullable: true }) statuses: cnst.${dict.Model}Status[] | null,
-    @Arg.Query("skip", () => Int, { nullable: true }) skip: number | null,
-    @Arg.Query("limit", () => Int, { nullable: true }) limit: number | null,
-    @Arg.Query("sort", () => String, { nullable: true }) sort: SortOf<cnst.${dict.Model}Filter> | null
-  ) {
-    const ${dict.models} = await this.${dict.model}Service.listByStatuses(statuses, { skip, limit, sort });
-    return resolve<cnst.${dict.Model}[]>(${dict.models});
-  }
-  @Query.Public(() => cnst.${dict.Model}Insight)
-  async ${dict.model}InsightInPublic(
-    @Arg.Query("statuses", () => [String], { nullable: true }) statuses: cnst.${dict.Model}Status[] | null
-  ) {
-    const ${dict.model}Insight = await this.${dict.model}Service.insightByStatuses(statuses);
-    return resolve<cnst.${dict.Model}Insight>(${dict.model}Insight);
-  }
-  // * Public Slice
-  // * /////////////////////////////////////
-}
+export class ${dict.Model}Internal extends internal(srv.${dict.model}, () => ({})) {}
+
+export class ${dict.Model}Slice extends slice(srv.${dict.model}, { guards: { get: "Public", cru: "Public" } }, (init) => ({
+  inPublic: init()
+    .search("statuses", [cnst.${dict.Model}Status])
+    .exec(function (statuses) {
+      return this.${dict.model}Service.queryByStatuses(statuses);
+    }),
+})) {}
+
+export class ${dict.Model}Endpoint extends endpoint(srv.${dict.model}, () => ({})) {}
 `;
 }

package/cjs/src/templates/module/__model__.store.js

@@ -26,8 +26,7 @@ function getContent(scanInfo, dict) {
   return `
 import { store } from "@akanjs/store";
 
-import * as cnst from "../cnst";
-import { fetch, sig } from "../useClient";
+import { sig } from "../useClient";
 
 export class ${dict.Model}Store extends store(sig.${dict.model}, {
   // state

package/cjs/src/templates/workspaceRoot/.gitignore.template

@@ -11,10 +11,12 @@ apps/*/data
 /releases
 apps/*/scripts
 **/.env
+**/env.client.local.ts
 **/env.client.debug.ts
 **/env.client.develop.ts
 **/env.client.main.ts
 **/env.client.testing.ts
+**/env.server.local.ts
 **/env.server.debug.ts
 **/env.server.develop.ts
 **/env.server.main.ts

package/esm/index.js

@@ -2035,9 +2035,10 @@ var Executor = class _Executor {
   async cp(srcPath, destPath) {
     const src = this.getPath(srcPath);
     const dest = this.getPath(destPath);
+    const isDirectory = fs8.statSync(src).isDirectory();
     if (!fs8.existsSync(src))
       return;
-    if (!fs8.existsSync(dest))
+    if (!fs8.existsSync(dest) && isDirectory)
       await fsPromise.mkdir(dest, { recursive: true });
     await fsPromise.cp(src, dest, { recursive: true });
   }

package/esm/src/templates/__scalar/__model__/__model__.constant.js

@@ -3,7 +3,6 @@ function getContent(scanInfo, dict) {
   return `
 import { via } from "@akanjs/constant";
 
-
 export class ${dict.Model} extends via((field) => ({
   field: field(String),
 })) {}

package/esm/src/templates/__scalar/__model__/__model__.dictionary.js

@@ -5,7 +5,7 @@ import { ModelDictionary } from "@akanjs/dictionary";
 
 import type { ${dict.Model} } from "./${dict.model}.constant";
 
-export const modelDictionary = {
+export const dictionary = {
   modelName: ["${dict.Model}", "${dict.Model}"],
   modelDesc: ["${dict.Model}", "${dict.Model}"],
 
@@ -17,8 +17,6 @@ export const modelDictionary = {
   // * ==================== Etc ==================== * //
   // * ==================== Etc ==================== * //
 } satisfies ModelDictionary<${dict.Model}>;
-
-export const ${dict.model}Dictionary = modelDictionary;
 `;
 }
 export {

package/esm/src/templates/app/instrumentation.js

@@ -0,0 +1,12 @@
+// pkgs/@akanjs/cli/src/templates/app/instrumentation.ts
+function getContent(scanInfo, dict) {
+  return `
+import { registerClient } from "./client";
+
+export const register = async () => {
+  await registerClient();
+};`;
+}
+export {
+  getContent as default
+};

package/esm/src/templates/app/lib/___appName__/__appName__.dictionary.js

@@ -2,13 +2,9 @@
 function getContent(scanInfo, dict) {
   return `
 import type { SignalDictionary } from "@akanjs/dictionary";
-import type { ${dict.AppName}Signal } from "./${dict.appName}.signal";
+import type { ${dict.AppName}Endpoint } from "./${dict.appName}.signal";
 
-const dictionary = {} as const;
-
-export const signalDictionary = {} satisfies SignalDictionary<${dict.AppName}Signal>;
-
-export const ${dict.appName}Dictionary = { ...dictionary, ...signalDictionary };
+export const dictionary = {} satisfies SignalDictionary<${dict.AppName}Endpoint>;
   `;
 }
 export {

package/esm/src/templates/app/lib/___appName__/__appName__.signal.js

@@ -1,11 +1,13 @@
 // pkgs/@akanjs/cli/src/templates/app/lib/___appName__/__appName__.signal.ts
 function getContent(scanInfo, dict) {
   return `
-import { signal } from "@akanjs/signal";
+import { endpoint, internal } from "@akanjs/signal";
 
-import * as cnst from "../cnst";
+import * as srv from "../srv";
 
-export class ${dict.AppName}Signal extends signal("${dict.AppName}" as const, cnst.Srvs) {}
+export class ${dict.AppName}Internal extends internal(srv.${dict.appName}, () => ({})) {}
+
+export class ${dict.AppName}Endpoint extends endpoint(srv.${dict.appName}, () => ({})) {}
   `;
 }
 export {

package/esm/src/templates/module/__model__.dictionary.js

@@ -60,8 +60,6 @@ export const signalDictionary = {
   "argdesc-${dict.model}InsightInPublic-statuses": ["Statuses to filter", "\uD544\uD130\uB9C1\uD560 \uC0C1\uD0DC"],
   // * ==================== Endpoint ==================== * //
 } satisfies SignalDictionary<${dict.Model}Signal, ${dict.Model}>;
-
-export const ${dict.model}Dictionary = { ...modelDictionary, ...signalDictionary };
 `;
 }
 export {

package/esm/src/templates/module/__model__.document.js

@@ -5,9 +5,14 @@ import { beyond, by, into, type SchemaOf } from "@akanjs/document";
 
 import * as cnst from "../cnst";
 
+export class ${dict.Model}Filter extends from(cnst.${dict.Model}, (filter) => ({
+  query: {},
+  sort: {},
+})) {}
+
 export class ${dict.Model} extends by(cnst.${dict.Model}) {}
 
-export class ${dict.Model}Model extends into(${dict.Model}, cnst.${dict.model}) {}
+export class ${dict.Model}Model extends into(${dict.Model}, ${dict.Model}Filter, cnst.${dict.model}) {}
 
 export class ${dict.Model}Middleware extends beyond(${dict.Model}Model, ${dict.Model}) {
   onSchema(schema: SchemaOf<${dict.Model}Model, ${dict.Model}>) {

package/esm/src/templates/module/__model__.signal.js

@@ -1,37 +1,22 @@
 // pkgs/@akanjs/cli/src/templates/module/__model__.signal.ts
 function getContent(scanInfo, dict) {
   return `
-import { Int } from "@akanjs/base";
-import type { SortOf } from "@akanjs/document";
-import { Arg, signal, Mutation, Query, resolve } from "@akanjs/signal";
+import { endpoint, internal, slice } from "@akanjs/signal";
 
 import * as cnst from "../cnst";
+import * as srv from "../srv";
 
-export class ${dict.Model}Signal extends signal(cnst.${dict.model}, cnst.Srvs, {
-  guards: { get: "Public", cru: "Public },
-}) {
-  // * /////////////////////////////////////
-  // * Public Slice
-  @Query.Public(() => [cnst.${dict.Model}])
-  async ${dict.model}ListInPublic(
-    @Arg.Query("statuses", () => [String], { nullable: true }) statuses: cnst.${dict.Model}Status[] | null,
-    @Arg.Query("skip", () => Int, { nullable: true }) skip: number | null,
-    @Arg.Query("limit", () => Int, { nullable: true }) limit: number | null,
-    @Arg.Query("sort", () => String, { nullable: true }) sort: SortOf<cnst.${dict.Model}Filter> | null
-  ) {
-    const ${dict.models} = await this.${dict.model}Service.listByStatuses(statuses, { skip, limit, sort });
-    return resolve<cnst.${dict.Model}[]>(${dict.models});
-  }
-  @Query.Public(() => cnst.${dict.Model}Insight)
-  async ${dict.model}InsightInPublic(
-    @Arg.Query("statuses", () => [String], { nullable: true }) statuses: cnst.${dict.Model}Status[] | null
-  ) {
-    const ${dict.model}Insight = await this.${dict.model}Service.insightByStatuses(statuses);
-    return resolve<cnst.${dict.Model}Insight>(${dict.model}Insight);
-  }
-  // * Public Slice
-  // * /////////////////////////////////////
-}
+export class ${dict.Model}Internal extends internal(srv.${dict.model}, () => ({})) {}
+
+export class ${dict.Model}Slice extends slice(srv.${dict.model}, { guards: { get: "Public", cru: "Public" } }, (init) => ({
+  inPublic: init()
+    .search("statuses", [cnst.${dict.Model}Status])
+    .exec(function (statuses) {
+      return this.${dict.model}Service.queryByStatuses(statuses);
+    }),
+})) {}
+
+export class ${dict.Model}Endpoint extends endpoint(srv.${dict.model}, () => ({})) {}
 `;
 }
 export {

package/esm/src/templates/module/__model__.store.js

@@ -3,8 +3,7 @@ function getContent(scanInfo, dict) {
   return `
 import { store } from "@akanjs/store";
 
-import * as cnst from "../cnst";
-import { fetch, sig } from "../useClient";
+import { sig } from "../useClient";
 
 export class ${dict.Model}Store extends store(sig.${dict.model}, {
   // state

package/esm/src/templates/workspaceRoot/.gitignore.template

@@ -11,10 +11,12 @@ apps/*/data
 /releases
 apps/*/scripts
 **/.env
+**/env.client.local.ts
 **/env.client.debug.ts
 **/env.client.develop.ts
 **/env.client.main.ts
 **/env.client.testing.ts
+**/env.server.local.ts
 **/env.server.debug.ts
 **/env.server.develop.ts
 **/env.server.main.ts

package/package.json

@@ -2,7 +2,7 @@
   "type": "module",
   "sourceType": "module",
   "name": "@akanjs/cli",
-  "version": "0.9.55",
+  "version": "0.9.56",
   "bin": {
     "akan": "esm/index.js"
   },

package/src/templates/app/instrumentation.d.ts

@@ -0,0 +1,6 @@
+import type { AppInfo, LibInfo } from "@akanjs/devkit";
+interface Dict {
+    appName: string;
+}
+export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: Dict): string;
+export {};