@fragno-dev/create 0.1.1 → 0.1.4

package/templates/optional/builder/rollup.config.js

@@ -11,6 +11,7 @@ export default [
       "client/svelte": "./src/client/svelte.ts",
       "client/vanilla": "./src/client/vanilla.ts",
       "client/vue": "./src/client/vue.ts",
+      "client/solid": "./src/client/solid.ts",
     },
     output: {
       dir: "./dist/browser",
@@ -18,11 +19,12 @@ export default [
       sourcemap: true,
     },
     // https://rollupjs.org/tools/#peer-dependencies
-    external: ["zod", "react", "svelte", "vue"],
+    external: ["zod", "react", "svelte", "vue", "solid-js", /^@fragno-dev\/db/],
     plugins: [
       resolve({
         moduleDirectories: ["node_modules"],
         browser: true,
+        conditions: ["browser"],
       }),
       typescript({
         tsconfig: "./tsconfig.json",
@@ -41,7 +43,6 @@ export default [
       format: "es",
       sourcemap: true,
     },
-    external: ["zod"],
     plugins: [
       resolve({
         moduleDirectories: ["node_modules"],

package/templates/optional/builder/rspack.config.js

@@ -16,6 +16,7 @@ export default [
       "client/svelte": "./src/client/svelte.ts",
       "client/vanilla": "./src/client/vanilla.ts",
       "client/vue": "./src/client/vue.ts",
+      "client/solid": "./src/client/solid.ts",
     },
     output: {
       path: path.resolve(__dirname, "dist/browser"),
@@ -48,7 +49,7 @@ export default [
     },
     plugins: [unpluginFragno({ platform: "browser" })],
     devtool: "source-map",
-    externals: ["zod", "react", "vue", "svelte"],
+    externals: ["zod", "react", "vue", "svelte", "solid-js", /^@fragno-dev\/db/],
   },
   // Node build
   {
@@ -88,6 +89,6 @@ export default [
     },
     plugins: [unpluginFragno({ platform: "node" })],
     devtool: "source-map",
-    externals: ["zod"],
+    externals: ["zod", /^@fragno-dev\/core/, /^@fragno-dev\/db/],
   },
 ];

package/templates/optional/builder/vite.config.ts

@@ -3,6 +3,9 @@ import unpluginFragno from "@fragno-dev/unplugin-fragno/vite";
 
 export default defineConfig({
   plugins: [unpluginFragno({ platform: "browser" })],
+  resolve: {
+    conditions: ["browser"],
+  },
   // https://vite.dev/guide/build.html#library-mode
   build: {
     lib: {
@@ -12,11 +15,12 @@ export default defineConfig({
         "client/svelte": "./src/client/svelte.ts",
         "client/vanilla": "./src/client/vanilla.ts",
         "client/vue": "./src/client/vue.ts",
+        "client/solid": "./src/client/solid.ts",
       },
       formats: ["es"],
     },
     rollupOptions: {
-      external: ["react", "vue", "svelte", "zod"],
+      external: ["react", "vue", "svelte", "solid-js", "zod", /^@fragno-dev\/db/],
     },
     outDir: "./dist/browser",
     sourcemap: true,

package/templates/optional/builder/webpack.config.js

@@ -16,6 +16,7 @@ export default [
       "client/svelte": "./src/client/svelte.ts",
       "client/vanilla": "./src/client/vanilla.ts",
       "client/vue": "./src/client/vue.ts",
+      "client/solid": "./src/client/solid.ts",
     },
     output: {
       path: path.resolve(__dirname, "dist/browser"),
@@ -41,7 +42,7 @@ export default [
     },
     plugins: [unpluginFragno({ platform: "browser" })],
     devtool: "source-map",
-    externals: ["react", "vue", "svelte", "zod"],
+    externals: ["react", "vue", "svelte", "solid-js", "zod", /^@fragno-dev\/db/],
   },
   // Node build
   {
@@ -74,6 +75,6 @@ export default [
     },
     plugins: [unpluginFragno({ platform: "node" })],
     devtool: "source-map",
-    externals: ["zod"],
+    externals: ["zod", /^@fragno-dev\/core/, /^@fragno-dev\/db/],
   },
 ];

package/templates/optional/database/index.ts

@@ -1,15 +1,7 @@
-import {
-  defineRoute,
-  defineRoutes,
-  createFragment,
-  type FragnoPublicClientConfig,
-} from "@fragno-dev/core";
-import { createClientBuilder } from "@fragno-dev/core/client";
-import {
-  defineFragmentWithDatabase,
-  type FragnoPublicConfigWithDatabase,
-} from "@fragno-dev/db/fragment";
-import type { AbstractQuery, TableToInsertValues } from "@fragno-dev/db/query";
+import { defineFragment, defineRoutes, instantiate } from "@fragno-dev/core";
+import { createClientBuilder, type FragnoPublicClientConfig } from "@fragno-dev/core/client";
+import { withDatabase, type FragnoPublicConfigWithDatabase } from "@fragno-dev/db";
+import type { TableToInsertValues } from "@fragno-dev/db/query";
 import { noteSchema } from "./schema";
 
 // NOTE: We use zod here for defining schemas, but any StandardSchema library can be used!
@@ -21,37 +13,32 @@ export interface ExampleConfig {
   // Add any server-side configuration here if needed
 }
 
-type ExampleServices = {
-  createNote: (note: TableToInsertValues<typeof noteSchema.tables.note>) => Promise<{
-    id: string;
-    content: string;
-    userId: string;
-    createdAt: Date;
-  }>;
-  getNotes: () => Promise<
-    Array<{
-      id: string;
-      content: string;
-      userId: string;
-      createdAt: Date;
-    }>
-  >;
-  getNotesByUser: (userId: string) => Promise<
-    Array<{
-      id: string;
-      content: string;
-      userId: string;
-      createdAt: Date;
-    }>
-  >;
-};
-
-type ExampleDeps = {
-  orm: AbstractQuery<typeof noteSchema>;
-};
+const exampleFragmentDefinition = defineFragment<ExampleConfig>("example-fragment")
+  .extend(withDatabase(noteSchema))
+  .providesBaseService(({ deps }) => {
+    return {
+      createNote: async (note: TableToInsertValues<typeof noteSchema.tables.note>) => {
+        const id = await deps.db.create("note", note);
+        return {
+          ...note,
+          id: id.valueOf(),
+          createdAt: note.createdAt ?? new Date(),
+        };
+      },
+      getNotes: () => {
+        return deps.db.find("note", (b) => b);
+      },
+      getNotesByUser: (userId: string) => {
+        return deps.db.find("note", (b) =>
+          b.whereIndex("idx_note_user", (eb) => eb("userId", "=", userId)),
+        );
+      },
+    };
+  })
+  .build();
 
-const exampleRoutesFactory = defineRoutes<ExampleConfig, ExampleDeps, ExampleServices>().create(
-  ({ services }) => {
+const exampleRoutesFactory = defineRoutes(exampleFragmentDefinition).create(
+  ({ services, defineRoute }) => {
     return [
       defineRoute({
         method: "GET",
@@ -70,11 +57,25 @@ const exampleRoutesFactory = defineRoutes<ExampleConfig, ExampleDeps, ExampleSer
 
           if (userId) {
             const notes = await services.getNotesByUser(userId);
-            return json(notes);
+            return json(
+              notes.map((note) => ({
+                id: note.id.valueOf(),
+                content: note.content,
+                userId: note.userId,
+                createdAt: note.createdAt,
+              })),
+            );
           }
 
           const notes = await services.getNotes();
-          return json(notes);
+          return json(
+            notes.map((note) => ({
+              id: note.id.valueOf(),
+              content: note.content,
+              userId: note.userId,
+              createdAt: note.createdAt,
+            })),
+          );
         },
       }),
 
@@ -100,34 +101,15 @@ const exampleRoutesFactory = defineRoutes<ExampleConfig, ExampleDeps, ExampleSer
   },
 );
 
-const exampleFragmentDefinition = defineFragmentWithDatabase<ExampleConfig>("example-fragment")
-  .withDatabase(noteSchema)
-  .withServices(({ orm }) => {
-    return {
-      createNote: async (note: TableToInsertValues<typeof noteSchema.tables.note>) => {
-        const id = await orm.create("note", note);
-        return {
-          ...note,
-          id: id.toJSON(),
-          createdAt: note.createdAt ?? new Date(),
-        };
-      },
-      getNotes: () => {
-        return orm.find("note", (b) => b);
-      },
-      getNotesByUser: (userId: string) => {
-        return orm.find("note", (b) =>
-          b.whereIndex("idx_note_user", (eb) => eb("userId", "=", userId)),
-        );
-      },
-    };
-  });
-
 export function createExampleFragment(
   config: ExampleConfig = {},
-  fragnoConfig: FragnoPublicConfigWithDatabase,
+  options: FragnoPublicConfigWithDatabase,
 ) {
-  return createFragment(exampleFragmentDefinition, config, [exampleRoutesFactory], fragnoConfig);
+  return instantiate(exampleFragmentDefinition)
+    .withConfig(config)
+    .withRoutes([exampleRoutesFactory])
+    .withOptions(options)
+    .build();
 }
 
 export function createExampleFragmentClients(fragnoConfig: FragnoPublicClientConfig) {
@@ -138,4 +120,4 @@ export function createExampleFragmentClients(fragnoConfig: FragnoPublicClientCon
     useCreateNote: b.createMutator("POST", "/notes"),
   };
 }
-export type { FragnoRouteConfig } from "@fragno-dev/core/api";
+export type { FragnoRouteConfig } from "@fragno-dev/core";