@sealcode/sealgen 0.17.1 → 0.17.2

package/@types/src/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" resolution-mode="require"/>
 export * as Controls from "./forms/controls/controls.js";
 export * from "./forms/fields/field.js";
 export * as Fields from "./forms/fields/fields.js";
@@ -16,3 +17,29 @@ export * from "./forms/multiform.js";
 export * as Components from "./components/components.js";
 export * from "./mount.js";
 export * from "./page/default-list-filters.js";
+import { Context } from "koa";
+import { Readable } from "node:stream";
+export interface HTMLOptions {
+    morphing?: boolean;
+}
+export interface HTMLHeadOptions {
+    ctx: Context;
+    title: string | Promise<string | Readable>;
+    options: Partial<HTMLOptions>;
+    metaImage?: string;
+    canonicalPath?: string;
+    css_clumps: string[];
+    description: string;
+}
+export interface htmlArgs {
+    ctx: Context;
+    title: string | Promise<string>;
+    body: string | Promise<string>;
+    htmlOptions?: Partial<HTMLOptions>;
+    makeHead?: (args: HTMLHeadOptions) => string | Promise<string> | Readable | Promise<Readable>;
+    metaImage?: string;
+    canonicalPath?: string;
+    css_clumps?: string[];
+    description: string;
+    hideNavigation?: boolean;
+}

package/lib/esbuild-plugins/rewrite-asset-imports.js

@@ -18,16 +18,17 @@ const rewrite_asset_imports_plugin = (project_dir) => ({
         });
       }
       const regex_import = new RegExp(
-        `^import (\\w+|{[^}]+}) from "([^"]+)";`,
+        `^import ([^ ]+, )?(\\w+|{[^}]+}) from "([^"]+)";`,
         "gm"
       );
       contents = contents.replaceAll(
         regex_import,
         (line, _, original_path) => {
-          return line.replace(
+          const replaced = line.replace(
             `"src/`,
             `"` + resolve(project_dir, "./dist") + "/"
           );
+          return replaced;
         }
       );
       contents = removeNamedImports(contents);

package/lib/generate-routes.js

@@ -1,6 +1,6 @@
 import { promises as fs } from "fs";
 import * as prettier from "prettier";
-import { relative } from "path";
+import { relative, resolve, basename } from "path";
 import _locreq from "locreq";
 import { walkDir } from "./utils/walk.js";
 import { importPath } from "./utils/import-path.js";
@@ -45,7 +45,10 @@ async function generateRoutes() {
       url: unescape_url_params(
         "/" + relative(
           target_locreq.resolve("src/back/routes"),
-          fullpath
+          resolve(
+            fullpath,
+            basename(fullpath).startsWith("index.") ? "../" : ""
+          )
         ).replace(/\..+/, "") + "/"
         // trailing slash is important here, as it enables to use the entire path while building relative URLs. For example, while visiting /users/123, the path ./add-photo leads to /users/add-photo. While visiting /users/123/ (note the trailing slash), the path ./add-photo leads to /users/123/add-photo
       )

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sealcode/sealgen",
-	"version": "0.17.1",
+	"version": "0.17.2",
 	"description": "Module to automate adding routes and collections to a sealious application",
 	"main": "lib/index.js",
 	"type": "module",

package/src/esbuild-plugins/rewrite-asset-imports.ts

@@ -20,21 +20,21 @@ export const rewrite_asset_imports_plugin = (project_dir: string) => ({
 				});
 			}
 			const regex_import = new RegExp(
-				`^import (\\w+|{[^}]+}) from "([^"]+)";`,
+				`^import ([^ ]+, )?(\\w+|{[^}]+}) from "([^"]+)";`,
 				"gm"
 			);
 			contents = contents.replaceAll(
 				regex_import,
 				(line, _: string, original_path: string) => {
-					return line.replace(
+					const replaced = line.replace(
 						`"src/`,
 						`"` + resolve(project_dir, "./dist") + "/"
 					);
+					return replaced;
 				}
 			);
 
 			contents = removeNamedImports(contents) as string;
-
 			return {
 				contents,
 				loader: extname(args.path) === ".tsx" ? "tsx" : "ts",

package/src/generate-routes.ts

@@ -1,6 +1,6 @@
 import { promises as fs } from "fs";
 import * as prettier from "prettier";
-import { relative } from "path";
+import { relative, resolve, basename } from "path";
 import _locreq from "locreq";
 import { walkDir } from "./utils/walk.js";
 import { importPath } from "./utils/import-path.js";
@@ -65,7 +65,12 @@ export async function generateRoutes(): Promise<void> {
 					"/" +
 						relative(
 							target_locreq.resolve("src/back/routes"),
-							fullpath
+							resolve(
+								fullpath,
+								basename(fullpath).startsWith("index.")
+									? "../"
+									: ""
+							)
 						).replace(/\..+/, "") +
 						"/" // trailing slash is important here, as it enables to use the entire path while building relative URLs. For example, while visiting /users/123, the path ./add-photo leads to /users/add-photo. While visiting /users/123/ (note the trailing slash), the path ./add-photo leads to /users/123/add-photo
 				),

package/src/index.ts

@@ -16,3 +16,35 @@ export * from "./forms/multiform.js";
 export * as Components from "./components/components.js";
 export * from "./mount.js";
 export * from "./page/default-list-filters.js";
+
+import { Context } from "koa";
+import { Readable } from "node:stream";
+
+export interface HTMLOptions {
+	morphing?: boolean;
+}
+
+export interface HTMLHeadOptions {
+	ctx: Context;
+	title: string | Promise<string | Readable>;
+	options: Partial<HTMLOptions>;
+	metaImage?: string;
+	canonicalPath?: string;
+	css_clumps: string[];
+	description: string;
+}
+
+export interface htmlArgs {
+	ctx: Context;
+	title: string | Promise<string>;
+	body: string | Promise<string>;
+	htmlOptions?: Partial<HTMLOptions>;
+	makeHead?: (
+		args: HTMLHeadOptions
+	) => string | Promise<string> | Readable | Promise<Readable>;
+	metaImage?: string;
+	canonicalPath?: string;
+	css_clumps?: string[];
+	description: string;
+	hideNavigation?: boolean;
+}