primate 0.39.0 → 0.39.1

package/lib/commands/init.js

@@ -135,9 +135,7 @@ const command_init = async () => {
     // files
     await gitignore(target);
     await tsconfig_json(target, { frontends });
-    await app_config(target, { frontends, backends, runtime });
-    if (with_i18n)
-        await i18n_config(target);
+    await app_config(target, { frontends, backends, runtime, with_i18n });
     if (with_sessions)
         await session_config(target);
     if (is.defined(db))
@@ -170,58 +168,62 @@ async function gitignore(root) {
     ].join("\n");
     await gi.write(content);
 }
-async function app_config(root, c) {
-    const config = root.join("config").join("app.ts");
-    await config.directory.create();
-    const frontend_imports = c.frontends
-        .map((f) => `import ${to_ident(f)} from "@primate/${f}";`)
-        .join("\n");
-    const backend_imports = c.backends
-        .map((b) => `import ${to_ident(b)} from "@primate/${b}";`)
-        .join("\n");
+function app_config_imports(choices) {
+    const config = `import config from "primate/config";`;
+    const frontend = choices.frontends.length > 0
+        ? choices.frontends
+            .map(i => `import ${to_ident(i)} from "@primate/${i}";`)
+            .join("\n")
+        : false;
+    const backend = choices.backends.length > 0
+        ? choices.backends
+            .map(i => `import ${to_ident(i)} from "@primate/${i}";`)
+            .join("\n")
+        : false;
+    const i18n = choices.with_i18n
+        ? `import en from "../locales/en-US.ts";`
+        : false;
+    return [config, frontend, backend, i18n, "\n"].filter(Boolean).join("\n");
+}
+function app_config_export(choices) {
     const modules = [
-        ...c.frontends.map((f) => `${to_ident(f)}()`),
-        ...c.backends.map((b) => `${to_ident(b)}()`),
+        ...choices.frontends.map((f) => `${to_ident(f)}()`),
+        ...choices.backends.map((b) => `${to_ident(b)}()`),
     ];
-    const body = `import config from "primate/config";
-${frontend_imports}
-${backend_imports}
-export default config({
-  modules: [
-    ${modules.join(",\n    ")}
+    const i18n = choices.with_i18n
+        ? `  i18n: {
+    defaultLocale: "en-US",
+    locales: {
+      "en-US": en,
+    },
+  },\n`
+        : "";
+    return `export default config({
+${i18n}  modules: [
+    ${modules.join(",\n    ")},
   ],
 });`;
-    await config.write(body);
 }
-// i18n scaffold: config + a default locale file
-async function i18n_config(root) {
-    const locales = root.join("locales");
-    const en_us = locales.join("en-US.ts");
-    const i18i = root.join("config").join("i18n.ts");
-    await en_us.directory.create();
-    await i18i.directory.create();
-    const locale = `import i18n from "primate/i18n";
+async function app_config(root, choices) {
+    const config = root.join("config").join("app.ts");
+    await config.directory.create();
+    if (choices.with_i18n) {
+        const locale = root.join("locales").join("en-US.ts");
+        await locale.directory.create();
+        await locale.write(`import i18n from "primate/i18n";
+
 export default i18n.locale({
-  hi: "Hello",
+  hi: "Hi",
   placeheld: "Hello, {name}",
-});`;
-    await en_us.write(locale);
-    const config = `import en from "#locale/en-US";
-import i18n from "primate/i18n";
-
-export default i18n({
-  defaultLocale: "en-US",
-  locales: {
-    "en-US": en,
-  },
-});`;
-    await i18i.write(config);
+});`);
+    }
+    await config.write(app_config_imports(choices) + app_config_export(choices));
 }
 async function session_config(root) {
     const file = root.join("config").join("session.ts");
     await file.directory.create();
     const body = `import session from "primate/session";
-export default session({});`;
+export default session({}); `;
     await file.write(body);
 }
 async function database_config(root, db) {
@@ -229,7 +231,7 @@ async function database_config(root, db) {
     await file.directory.create();
     const ident = to_ident(db);
     const body = `import ${ident} from "@primate/${db}";
-export default ${ident}();`;
+export default ${ident} (); `;
     await file.write(body);
 }
 async function package_json(root, c) {
@@ -266,7 +268,6 @@ function safe(s) {
         .replace(/[^a-z0-9._-]/g, "") || "primate-app";
 }
 function to_ident(token) {
-    // turn tokens like "web-components" into valid identifiers: "web_components"
     return token.replace(/[^a-zA-Z0-9_$]/g, "_");
 }
 function compute_packages(args) {
@@ -344,9 +345,9 @@ async function tsconfig_json(root, opts) {
         compilerOptions: {
             baseUrl: "${configDir}",
             paths: {
+                "#app": ["config/app"],
                 "#session": ["config/session"],
                 "#db": ["config/db"],
-                "#i18n": ["config/i18n"],
                 "#config/*": ["config/*"],
                 "#view/*": ["views/*"],
                 "#component/*": ["components/*"],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "primate",
-  "version": "0.39.0",
+  "version": "0.39.1",
   "description": "The universal web framework",
   "homepage": "https://primate.run",
   "bugs": "https://github.com/primate-run/primate/issues",
@@ -27,7 +27,7 @@
     "@rcompat/is": "^0.11.0",
     "@rcompat/runtime": "^0.16.0",
     "@rcompat/test": "^0.17.0",
-    "@primate/core": "^0.8.0"
+    "@primate/core": "^0.8.5"
   },
   "devDependencies": {
     "@rcompat/type": "^0.17.0"