@dnax/core 0.47.3 → 0.48.0

package/lib/index.ts

@@ -8,6 +8,7 @@ import { loadSocket } from "../lib/socket";
 import { loadAutoRoutes } from "./routes";
 import { initScript } from "../lib/scripts";
 import { syncAdapterFileSystem } from "./media";
+import { runGenTypes } from "../types/gen";
 // load all ressource
 async function init(cf = { app: null }) {
   await loadSocket();
@@ -36,6 +37,8 @@ async function init(cf = { app: null }) {
 
   await initCron();
 
+  runGenTypes();
+
   initScript();
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dnax/core",
-  "version": "0.47.3",
+  "version": "0.48.0",
   "module": "index.ts",
   "type": "module",
   "bin": {
@@ -33,7 +33,6 @@
     "cookie": "^0.6.0",
     "croner": "8.1.1",
     "deepcopy": "^2.1.0",
-    "docxtemplater": "^3.54.1",
     "dot-object": "2.1.5",
     "find-open-port": "^2.0.3",
     "fs-extra": "^11.2.0",
@@ -46,7 +45,7 @@
     "mime-types": "^2.1.35",
     "mingo": "^6.5.0",
     "moment": "^2.30.1",
-    "mongodb": "6.11.0",
+    "mongodb": "6.15.0",
     "nodemailer": "^6.9.14",
     "pidusage": "^4.0.0",
     "pizzip": "^3.1.8",

package/types/gen.ts

@@ -0,0 +1,56 @@
+import fs from "fs-extra";
+import path from "path";
+import { fileURLToPath } from "url";
+import { Cfg } from "../config";
+import tsconfig from "./tsconfig.json";
+const TYPE_GEN = path.join(process.cwd(), ".dnax");
+const allDirs = ["types"];
+
+async function createDnaxDir() {
+  const dnaxDir = path.join(process.cwd(), ".dnax");
+  for await (const dir of allDirs) {
+    const dirPath = path.join(dnaxDir, dir);
+    if (!fs.existsSync(dirPath)) {
+      fs.mkdirSync(dirPath, { recursive: true });
+    }
+  }
+
+  // copy tsconfig coentent to  to .dnax/tsconfig.json
+  const tsconfigPath = path.join(dnaxDir, "tsconfig.json");
+  if (!fs.existsSync(tsconfigPath)) {
+    fs.writeFileSync(tsconfigPath, JSON.stringify(tsconfig, null, 2));
+  } else {
+    const currentContent = fs.readFileSync(tsconfigPath, "utf8");
+    if (currentContent !== JSON.stringify(tsconfig, null, 2)) {
+      fs.writeFileSync(tsconfigPath, JSON.stringify(tsconfig, null, 2));
+    }
+  }
+}
+
+function generateCollectionTypes() {
+  let collections = Cfg.collections?.map((f) => f?.slug);
+  collections = [...new Set(collections)];
+  // export collection type
+  let collectionsType = `type CollectionTypeList = ${collections
+    .map((c) => `'${c}'`)
+    .join(" | ")};\n`;
+
+  const collectionsTypeFile = path.join(TYPE_GEN, "types", "collections.d.ts");
+
+  if (!fs?.existsSync(collectionsTypeFile)) {
+    fs.writeFileSync(collectionsTypeFile, collectionsType);
+  } else {
+    const currentContent = fs.readFileSync(collectionsTypeFile, "utf8");
+    // console.log("Current content", currentContent);
+    if (currentContent !== collectionsType) {
+      fs.writeFileSync(collectionsTypeFile, collectionsType);
+    }
+  }
+}
+
+async function runGenTypes() {
+  await createDnaxDir();
+  await generateCollectionTypes();
+}
+
+export { runGenTypes };

package/types/index.ts

@@ -713,3 +713,7 @@ export type permissionSchema = {
   description?: string;
   access: Array<accessType> | [];
 };
+
+export type CoreType = {
+  listCollections: () => Array<Collection>;
+};

package/types/tsconfig.json

@@ -0,0 +1,38 @@
+{
+    "compilerOptions": {
+        "paths": {
+            "#/*": [
+                "../*"
+            ]
+        },
+        // Enable latest features
+        "lib": [
+            "ESNext",
+            "DOM",
+            "DOM.Iterable"
+        ],
+        "target": "ESNext",
+        "module": "ESNext",
+        "moduleDetection": "auto",
+        "allowJs": true,
+        // Bundler mode
+        "moduleResolution": "bundler",
+        "allowImportingTsExtensions": true,
+        "verbatimModuleSyntax": true,
+        "noEmit": true,
+        // Best practices
+        "strict": true,
+        "skipLibCheck": true,
+        "noFallthroughCasesInSwitch": true,
+        // Some stricter flags (disabled by default)
+        "noUnusedLocals": false,
+        "noUnusedParameters": false,
+        "noPropertyAccessFromIndexSignature": false
+    },
+    "include": [
+        "../node_modules/@dnax/core/types/**/*",
+        "./types/**/*.d.ts",
+        "../**/*",
+    ],
+    // "exclude": []
+}

package/utils/index.ts

@@ -8,7 +8,6 @@ import { Cfg } from "../config";
 import jwto from "jsonwebtoken";
 import generateUniqueId from "generate-unique-id";
 import dayjs from "dayjs";
-import { Otp } from "../lib/opt";
 import collect from "collect.js";
 import mime from "mime-types";
 import * as uuid from "uuid";
@@ -562,7 +561,6 @@ export {
   generateUniqueId, // Generate unique id
   omit, // Omit utils
   collect, // Collect utils
-  Otp, // Otp utils
   urlencode,
   stringToBoolean,
   copy,

package/lib/opt.ts

@@ -1,55 +0,0 @@
-import { parse } from "@lukeed/ms";
-import generateUniqueId from "generate-unique-id";
-type otpOptions = {
-  length?: number;
-  useLetters?: boolean;
-  useNumbers?: boolean;
-  includeSymbols?: Array<any>;
-  excludeSymbols?: Array<any>;
-  expireIn?: string;
-};
-
-class Otp {
-  #otps: Map<string, number> = new Map();
-  #options: otpOptions;
-  constructor(options: otpOptions) {
-    this.#options = options;
-  }
-
-  generate(options: { id?: string; data?: any } = {}): string | number {
-    setTimeout(() => {}, parse(String(this.#options.expireIn) || "1m"));
-    let otpCode = generateUniqueId({
-      length: this.#options.length || 6,
-      includeSymbols: this.#options.includeSymbols || [],
-      useLetters: this.#options.useLetters || true,
-      useNumbers: this.#options.useNumbers || true,
-      excludeSymbols: this.#options.excludeSymbols || [],
-    });
-    this.#otps.set(options?.id, {
-      otp: otpCode,
-      data: options?.data,
-    });
-
-    setTimeout(() => {
-      this.#otps.delete(options?.id);
-    }, parse(String(this.#options?.expireIn) || "1m"));
-    return otpCode;
-  }
-
-  delete(id: string): boolean {
-    return this.#otps.delete(id) ? true : false;
-  }
-  verify(id: string, otp: string): { valid: boolean; data: any } {
-    // verify otp
-    let otpData = this.#otps.get(id);
-    if (!otpData) return { valid: false, data: null };
-    if (otpData.otp === otp) {
-      this.#otps.delete(id);
-      return { valid: true, data: otpData?.data };
-    } else {
-      return { valid: false, data: null };
-    }
-  }
-}
-
-export { Otp };