Merge develop progress for publishing (#16)

Author: eveffer

.gitignore

@@ -1,3 +1,5 @@
 .inspatial/
 deno.lock
-serve-config.json
+cloud-config.json
+pgdata/
+debug.log

.zed/settings.json

@@ -33,6 +33,11 @@
     "TypeScript": {
       "language_servers": ["deno"],
       "formatter": "language_server"
+    },
+    "JavaScript": {
+      "language_servers": ["deno"],
+      "formatter": "language_server"
+      // "prettier": null
     }
   }
 }

.zed/tasks.json

@@ -1,13 +1,19 @@
 [
   {
     "command": "deno",
-    "args": ["task", "dev"],
-    "cwd": "$ZED_WORKTREE_ROOT/dev",
-    "label": "Dev App",
+    "args": [
+      "run",
+      "-A",
+      "--watch",
+      "--watch-exclude=.inspatial",
+      "--unstable-broadcast-channel",
+      "mainApp.ts"
+    ],
+    "cwd": "$ZED_WORKTREE_ROOT/examples/basic",
+    "label": "Example: Basic",
     "allow_concurrent_runs": false,
     "reveal": "always",
     "use_new_terminal": false,
-    "tags": ["App"],
     "reveal_target": "dock"
   }
 ]

deno.json

@@ -1,12 +1,25 @@
 {
   "name": "@inspatial/cloud",
-  "version": "0.1.7",
+  "version": "0.2.0",
   "license": "Apache-2.0",
   "exports": {
     ".": "./mod.ts",
     "./extensions": "./extensions/mod.ts",
     "./types": "./types.ts"
   },
+  "publish": {
+    "include": [
+      "src/",
+      "examples/",
+      "extensions/",
+      "types.ts",
+      "mod.ts",
+      "README.md",
+      "LICENSE"
+    ],
+    "exclude": [".github/", ".vscode/", ".zed/", "examples/**/.inspatial/"]
+  },
+
   "imports": {
     "#/": "./src/",
     "#extensions/": "./extensions/",
@@ -18,8 +31,8 @@
   },
   "lint": {
     "rules": {
-      "tags": ["jsr", "recommended"],
-      "include": ["explicit-module-boundary-types", "verbatim-module-syntax"],
+      "tags": [],
+      "include": ["verbatim-module-syntax"],
       "exclude": ["no-explicit-any"]
     }
   }

examples/basic/main.ts

@@ -0,0 +1,32 @@
+import { CloudExtension, InCloud } from "@inspatial/cloud";
+import { EntryType } from "#/orm/mod.ts";
+
+const app = new InCloud("myApp", {
+  extensions: [
+    new CloudExtension("myApp", {
+      label: "My App",
+      description: "My awesome app",
+      entryTypes: [
+        new EntryType("something", {
+          fields: [{
+            key: "thing",
+            label: "Thingd",
+            type: "DataField",
+          }, {
+            key: "more",
+            label: "More",
+            type: "DataField",
+          }],
+        }),
+      ],
+    }),
+  ],
+});
+
+if (import.meta.main) {
+  app.run();
+  // const result = Deno.readDirSync("/");
+  // for (const item of result) {
+  //   console.log(item.name, item.isFile, item.isDirectory, item.isSymlink);
+  // }
+}

examples/basic/mainApp.ts

@@ -1,6 +1,4 @@
 import type { InCloud } from "#/inspatial-cloud.ts";
-import ColorMe from "#/utils/color-me.ts";
-import { inLog } from "#/in-log/in-log.ts";
 
 async function checkForUser(app: InCloud) {
   const { orm } = app;
@@ -25,61 +23,21 @@ async function checkForUser(app: InCloud) {
     await user.save();
     await user.runAction("setPassword", { password });
     app.inLog.info("Admin user created successfully.");
-    prompt("Press any key to continue...");
+    // prompt("Press any key to continue...");
   }
 }
 
 function promptForUser() {
-  const subject = "Create User";
-  let firstName: string | null = "";
-  let lastName: string | null = "";
-  let email: string | null = "";
-  let password: string | null = "";
-  while (!firstName) {
-    firstName = prompt(ColorMe.fromOptions("First Name:", {
-      color: "brightCyan",
-    }));
-    if (!firstName) {
-      inLog.warn("First name cannot be empty", subject);
-    }
-  }
-  while (!lastName) {
-    lastName = prompt(ColorMe.fromOptions("Last Name:", {
-      color: "brightCyan",
-    }));
-    if (!lastName) {
-      inLog.warn("Last name cannot be empty", subject);
-    }
-  }
-  while (!email) {
-    email = prompt(ColorMe.fromOptions("Email:", { color: "brightCyan" }));
-    if (!email) {
-      inLog.warn("Email cannot be empty", subject);
-    }
-  }
-  while (!password) {
-    password = prompt("Password:");
-    if (!password) {
-      inLog.warn("Password cannot be empty", subject);
-    }
-  }
-  const user = {
+  let firstName: string | null = "InSpatial";
+  let lastName: string | null = "Admin";
+  let email: string | null = "[email protected]";
+  let password: string | null = "password";
+  return {
     firstName,
     lastName,
     email,
     password,
   };
-
-  inLog.info(
-    `User: ${ColorMe.fromOptions(user.firstName, { color: "green" })} ${
-      ColorMe.fromOptions(
-        user.lastName,
-        { color: "green" },
-      )
-    } ${ColorMe.fromOptions(user.email, { color: "green" })}`,
-    subject,
-  );
-  return user;
 }
 
 export default checkForUser;

extensions/auth/boot/checkForUser.ts

@@ -1,5 +1,4 @@
 import type { EntryBase } from "#/orm/entry/entry-base.ts";
-
 export interface UserSession extends EntryBase {
   _name: "userSession";
   /**
@@ -11,7 +10,6 @@ export interface UserSession extends EntryBase {
    * @required true
    */
   user: string;
-  _userTitle?: string;
   /**
    * **Session ID** (DataField)
    * @description Unique identifier for the session
@@ -45,4 +43,10 @@ export interface UserSession extends EntryBase {
    * @required true
    */
   updatedAt: number;
+  /**
+   * **User Title** (DataField)
+   * @description The user's full name (automatically generated)
+   * @type {string}
+   */
+  user__title?: string;
 }

extensions/auth/entry-types/generated-types/user-session.ts

@@ -25,10 +25,16 @@ export interface User extends EntryBase {
   email: string;
   /**
    * **Full Name** (DataField)
-   * @description The user's password used for login
+   * @description The user's full name (automatically generated)
    * @type {string}
    */
   fullName?: string;
+  /**
+   * **Profile Picture** (ImageField)
+   * @description The user's profile picture
+   * @type {string}
+   */
+  profilePicture?: string;
   /**
    * **Password** (PasswordField)
    * @description The user's password used for login
@@ -108,4 +114,9 @@ export interface User extends EntryBase {
    * @required true
    */
   updatedAt: number;
+  /**
+   * **Profile Picture Title** (DataField)
+   * @type {string}
+   */
+  profilePicture__title?: string;
 }

extensions/auth/entry-types/generated-types/user.ts

@@ -9,6 +9,7 @@ const userSessionEntry = new EntryType<UserSession>("userSession", {
   idMode: "ulid",
   fields: fields,
   actions: [],
+  defaultListFields: ["user"],
   hooks: {
     beforeCreate: [{
       name: "setSessionId",