@graphprotocol/hypergraph 0.4.2 → 0.5.0-alpha.1

package/dist/cli/services/Utils.js

@@ -1,3 +1,4 @@
+import { Doc } from '@effect/printer';
 import { Data, Effect, Array as EffectArray } from 'effect';
 import ts from 'typescript';
 import * as Mapping from '../../mapping/Mapping.js';
@@ -34,23 +35,35 @@ export const parseSchema = (sourceCode, mapping) => Effect.try({
                         const propName = prop.name.text;
                         let dataType = 'String';
                         let relationType;
+                        let isOptional = false;
                         const mappingEntry = mapping[className];
                         const camelCasePropName = Utils.toCamelCase(propName);
+                        // Check if the property is wrapped with Type.optional()
+                        let typeExpression = prop.initializer;
+                        if (ts.isCallExpression(typeExpression) && ts.isPropertyAccessExpression(typeExpression.expression) && typeExpression.expression.name.text === 'optional') {
+                          isOptional = true;
+                          // Unwrap the optional to get the actual type
+                          if (typeExpression.arguments.length > 0) {
+                            typeExpression = typeExpression.arguments[0];
+                          }
+                        }
                         // Extract the type
-                        if (ts.isPropertyAccessExpression(prop.initializer)) {
-                          // Simple types like Type.Text
-                          dataType = Mapping.getDataType(prop.initializer.name.text);
+                        if (ts.isPropertyAccessExpression(typeExpression)) {
+                          // Simple types like Type.String
+                          dataType = Mapping.getDataType(typeExpression.name.text);
                           // Look up the property's knowledgeGraphId from the mapping
                           const propKnowledgeGraphId = mappingEntry?.properties?.[camelCasePropName] || null;
                           // push to type properties as primitive property
                           properties.push({
                             name: propName,
                             dataType: dataType,
-                            knowledgeGraphId: propKnowledgeGraphId
+                            knowledgeGraphId: propKnowledgeGraphId,
+                            optional: isOptional || undefined,
+                            status: propKnowledgeGraphId != null ? 'published' : 'synced'
                           });
-                        } else if (ts.isCallExpression(prop.initializer)) {
+                        } else if (ts.isCallExpression(typeExpression)) {
                           // Relation types like Type.Relation(User)
-                          const callNode = prop.initializer;
+                          const callNode = typeExpression;
                           if (ts.isPropertyAccessExpression(callNode.expression)) {
                             const typeName = callNode.expression.name.text;
                             if (typeName === 'Relation' && callNode.arguments.length > 0) {
@@ -65,7 +78,9 @@ export const parseSchema = (sourceCode, mapping) => Effect.try({
                                   name: propName,
                                   dataType,
                                   relationType,
-                                  knowledgeGraphId: relKnowledgeGraphId
+                                  knowledgeGraphId: relKnowledgeGraphId,
+                                  optional: isOptional || undefined,
+                                  status: relKnowledgeGraphId != null ? 'published' : 'synced'
                                 });
                               }
                             }
@@ -85,7 +100,8 @@ export const parseSchema = (sourceCode, mapping) => Effect.try({
         entities.push({
           name: className,
           knowledgeGraphId: typeKnowledgeGraphId,
-          properties
+          properties,
+          status: typeKnowledgeGraphId != null ? 'published' : 'synced'
         });
       }
       ts.forEachChild(node, visit);
@@ -151,4 +167,178 @@ export function parseHypergraphMapping(moduleExport) {
   // If no preferred names found, use the first one
   return mappingCandidates[0][1];
 }
+function fieldToEntityString({
+  name,
+  dataType,
+  optional = false
+}) {
+  // Convert type to Entity type
+  const entityType = (() => {
+    switch (true) {
+      case dataType === 'String':
+        return 'Type.String';
+      case dataType === 'Number':
+        return 'Type.Number';
+      case dataType === 'Boolean':
+        return 'Type.Boolean';
+      case dataType === 'Date':
+        return 'Type.Date';
+      case dataType === 'Point':
+        return 'Type.Point';
+      case Mapping.isDataTypeRelation(dataType):
+        // renders the type as `Type.Relation(Entity)`
+        return `Type.${dataType}`;
+      default:
+        // how to handle complex types
+        return 'Type.String';
+    }
+  })();
+  if (optional === true) {
+    return `  ${Utils.toCamelCase(name)}: Type.optional(${entityType})`;
+  }
+  // adds a tab before the property
+  return `  ${Utils.toCamelCase(name)}: ${entityType}`;
+}
+function typeDefinitionToString(type) {
+  if (!type.name) {
+    return null;
+  }
+  const fields = type.properties.filter(_prop => _prop.name != null && _prop.name.length > 0);
+  if (fields.length === 0) {
+    return null;
+  }
+  const fieldStrings = fields.map(fieldToEntityString);
+  const name = Utils.toPascalCase(type.name);
+  return `export class ${name} extends Entity.Class<${name}>('${name}')({
+${fieldStrings.join(',\n')}
+}) {}`;
+}
+/**
+ * Builds a string of the schema.ts file contents after parsing the schema into the correct format.
+ *
+ * @example
+ *
+ * ```typescript
+ * const schema = Model.TypesyncHypergraphSchema.make({
+ *   types: [
+ *     {
+ *       name: "User",
+ *       knowledgeGraphId: null,
+ *       status: null,
+ *       properties: [
+ *         {
+ *           name: "name",
+ *           dataType: "String",
+ *           knowledgeGraphId: null,
+ *           optional: null,
+ *           status: null
+ *         }
+ *       ]
+ *     }
+ *   ]
+ * })
+ * const schemaFile = buildSchemaFile(schema)
+ *
+ * expect(schemaFile).toEqual(`
+ * import { Entity, Type } from '@graphprotocol/hypergraph';
+ *
+ * export class User extends Entity.Class<User>('User')({
+ *   name: Type.String
+ * }) {}
+ * `)
+ * ```
+ */
+export function buildSchemaFile(schema) {
+  const importStatement = `import { Entity, Type } from '@graphprotocol/hypergraph';`;
+  const typeDefinitions = schema.types.map(typeDefinitionToString).filter(def => def != null).join('\n\n');
+  return [importStatement, typeDefinitions].join('\n\n');
+}
+export function buildMappingFile(mapping) {
+  // Import statements
+  const imports = Doc.vsep([Doc.text("import type { Mapping } from '@graphprotocol/hypergraph/mapping';"), Doc.text("import { Id } from '@graphprotocol/hypergraph';")]);
+  // Generate the mapping object - build it line by line for exact formatting
+  const mappingLines = [Doc.text('export const mapping: Mapping = {')];
+  for (const [typeName, typeData] of Object.entries(mapping)) {
+    mappingLines.push(Doc.text(`  ${typeName}: {`));
+    // Type IDs
+    const typeIdsList = typeData.typeIds.map(id => `Id("${id}")`).join(', ');
+    mappingLines.push(Doc.text(`    typeIds: [${typeIdsList}],`));
+    // Properties
+    const properties = Object.entries(typeData.properties ?? {});
+    if (EffectArray.isNonEmptyArray(properties)) {
+      mappingLines.push(Doc.text('    properties: {'));
+      properties.forEach(([propName, propId], index, entries) => {
+        const isLast = index === entries.length - 1;
+        const comma = isLast ? '' : ',';
+        mappingLines.push(Doc.text(`      ${propName}: Id("${propId}")${comma}`));
+      });
+      mappingLines.push(Doc.text('    },'));
+    }
+    // Relations
+    const relations = Object.entries(typeData.relations ?? {});
+    if (EffectArray.isNonEmptyArray(relations)) {
+      mappingLines.push(Doc.text('    relations: {'));
+      relations.forEach(([relationName, relationId], index, entries) => {
+        const isLast = index === entries.length - 1;
+        const comma = isLast ? '' : ',';
+        mappingLines.push(Doc.text(`      ${relationName}: Id("${relationId}")${comma}`));
+      });
+      mappingLines.push(Doc.text('    },'));
+    }
+    mappingLines.push(Doc.text('  },'));
+  }
+  mappingLines.push(Doc.rbrace);
+  const compiled = Doc.vcat([imports, Doc.empty, ...mappingLines]);
+  return Doc.render(compiled, {
+    style: 'pretty',
+    options: {
+      lineWidth: 120
+    }
+  });
+}
+/**
+ * Builds a string of the mapping.ts file contents after parsing the schema into the correct mapping format.
+ *
+ * @example
+ *
+ * ```typescript
+ * const schema = Model.TypesyncHypergraphSchema.make({
+ *   types: [
+ *     {
+ *       name: "User",
+ *       knowledgeGraphId: "7f9562d4-034d-4385-bf5c-f02cdebba47a",
+ *       status: null,
+ *       properties: [
+ *         {
+ *           name: "name",
+ *           dataType: "String",
+ *           knowledgeGraphId: "a126ca53-0c8e-48d5-b888-82c734c38935",
+ *           optional: null,
+ *           status: null
+ *         }
+ *       ]
+ *     }
+ *   ]
+ * })
+ * const mappingFile = buildMappingFile(schema)
+ *
+ * expect(mappingFile).toEqual(`
+ * import type { Mapping } from '@graphprotocol/hypergraph/mapping';
+ * import { Id } from '@graphprotocol/hypergraph';
+ *
+ * export const mapping: Mapping = {
+ *   User: {
+ *     typeIds: [Id('7f9562d4-034d-4385-bf5c-f02cdebba47a')],
+ *     properties: {
+ *       name: Id('a126ca53-0c8e-48d5-b888-82c734c38935'),
+ *     }
+ *   }
+ * }
+ * `)
+ * ```
+ */
+export function buildMappingFileFromSchema(schema) {
+  const [mapping] = Mapping.generateMapping(schema);
+  return buildMappingFile(mapping);
+}
 //# sourceMappingURL=Utils.js.map

package/dist/cli/services/Utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"Utils.js","names":["Data","Effect","Array","EffectArray","ts","Mapping","Utils","parseSchema","sourceCode","mapping","try","sourceFile","createSourceFile","ScriptTarget","Latest","entities","visit","node","isClassDeclaration","name","className","text","properties","heritageClauses","clause","type","types","isCallExpression","expression","callExpr","arguments","length","arg","isObjectLiteralExpression","prop","isPropertyAssignment","isIdentifier","propName","dataType","relationType","mappingEntry","camelCasePropName","toCamelCase","isPropertyAccessExpression","initializer","getDataType","propKnowledgeGraphId","push","knowledgeGraphId","callNode","typeName","relationArg","relKnowledgeGraphId","relations","toPascalCase","typeKnowledgeGraphId","typeIds","forEachChild","catch","error","SchemaParserFailure","message","cause","TaggedError","isMappingLike","value","Object","values","every","entry","isArray","parseHypergraphMapping","moduleExport","mappingCandidates","entries","filter","preferredNames","preferredName","found","find"],"sources":["../../../src/cli/services/Utils.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"Utils.js","names":["Doc","Data","Effect","Array","EffectArray","ts","Mapping","Utils","parseSchema","sourceCode","mapping","try","sourceFile","createSourceFile","ScriptTarget","Latest","entities","visit","node","isClassDeclaration","name","className","text","properties","heritageClauses","clause","type","types","isCallExpression","expression","callExpr","arguments","length","arg","isObjectLiteralExpression","prop","isPropertyAssignment","isIdentifier","propName","dataType","relationType","isOptional","mappingEntry","camelCasePropName","toCamelCase","typeExpression","initializer","isPropertyAccessExpression","getDataType","propKnowledgeGraphId","push","knowledgeGraphId","optional","undefined","status","callNode","typeName","relationArg","relKnowledgeGraphId","relations","toPascalCase","typeKnowledgeGraphId","typeIds","forEachChild","catch","error","SchemaParserFailure","message","cause","TaggedError","isMappingLike","value","Object","values","every","entry","isArray","parseHypergraphMapping","moduleExport","mappingCandidates","entries","filter","preferredNames","preferredName","found","find","fieldToEntityString","entityType","isDataTypeRelation","typeDefinitionToString","fields","_prop","fieldStrings","map","join","buildSchemaFile","schema","importStatement","typeDefinitions","def","buildMappingFile","imports","vsep","mappingLines","typeData","typeIdsList","id","isNonEmptyArray","forEach","propId","index","isLast","comma","relationName","relationId","rbrace","compiled","vcat","empty","render","style","options","lineWidth","buildMappingFileFromSchema","generateMapping"],"sources":["../../../src/cli/services/Utils.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/cli/subcommands/typesync.d.ts

@@ -1,7 +1,18 @@
 import { Command } from '@effect/cli';
-export declare const typesync: Command.Command<"typesync", never, import("@effect/platform/HttpServerError").ServeError, {
+import { Path } from '@effect/platform';
+import { Cause } from 'effect';
+declare const OpenBrowserError_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").Equals<A, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }) => Cause.YieldableError & {
+    readonly _tag: "Nozzle/cli/studio/errors/OpenBrowserError";
+} & Readonly<A>;
+export declare class OpenBrowserError extends OpenBrowserError_base<{
+    readonly cause: unknown;
+}> {
+}
+export declare const typesync: Command.Command<"typesync", Path.Path, import("@effect/platform/HttpServerError").ServeError, {
     readonly args: {
-        readonly port: number;
+        readonly open: boolean;
+        readonly browser: "chrome" | "firefox" | "edge" | "browser" | "browserPrivate" | "arc" | "safari";
     };
 }>;
+export {};
 //# sourceMappingURL=typesync.d.ts.map

package/dist/cli/subcommands/typesync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typesync.d.ts","sourceRoot":"","sources":["../../../src/cli/subcommands/typesync.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAW,MAAM,aAAa,CAAC;AAmE/C,eAAO,MAAM,QAAQ;;;;EAwBpB,CAAC"}
+{"version":3,"file":"typesync.d.ts","sourceRoot":"","sources":["../../../src/cli/subcommands/typesync.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAW,MAAM,aAAa,CAAC;AAC/C,OAAO,EAYL,IAAI,EACL,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,KAAK,EAA+C,MAAM,QAAQ,CAAC;;;;AA6N5E,qBAAa,gBAAiB,SAAQ,sBAA8D;IAClG,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;CACzB,CAAC;CAAG;AAEL,eAAO,MAAM,QAAQ;;;;;EAyDpB,CAAC"}

package/dist/cli/subcommands/typesync.js

@@ -1,38 +1,158 @@
 import { createServer } from 'node:http';
+import { fileURLToPath } from 'node:url';
 import { Command, Options } from '@effect/cli';
-import { HttpApi, HttpApiBuilder, HttpApiEndpoint, HttpApiError, HttpApiGroup, HttpApiSchema, HttpMiddleware, HttpServer, HttpServerResponse } from '@effect/platform';
+import { FileSystem, HttpApi, HttpApiBuilder, HttpApiEndpoint, HttpApiError, HttpApiGroup, HttpApiSchema, HttpMiddleware, HttpRouter, HttpServer, HttpServerResponse, Path } from '@effect/platform';
 import { NodeHttpServer } from '@effect/platform-node';
 import { AnsiDoc } from '@effect/printer-ansi';
-import { Effect, Layer, Schema } from 'effect';
+import { Cause, Data, Effect, Layer, Option, Schema, Struct } from 'effect';
+import open, { apps } from 'open';
+import * as Model from '../services/Model.js';
 import * as Typesync from '../services/Typesync.js';
-const hypergraphTypeSyncApi = /*#__PURE__*/HttpApi.make('HypergraphTypeSyncApi').add(HttpApiGroup.make('SchemaStreamGroup').add(
+class HypergraphTypesyncStudioApiRouter extends /*#__PURE__*/HttpApiGroup.make('HypergraphTypesyncStudioApiRouter').add(
 // exposes an api endpoint at /api/vX/schema/events that is a stream of the current Schema parsed from the directory the hypergraph-cli tool is running in
 HttpApiEndpoint.get('HypergraphSchemaEventStream')`/schema/events`.addError(HttpApiError.InternalServerError).addSuccess(Schema.String.pipe(HttpApiSchema.withEncoding({
   kind: 'Json',
   contentType: 'text/event-stream'
-})))).prefix('/v1')).prefix('/api');
-const hypergraphTypeSyncApiLive = /*#__PURE__*/HttpApiBuilder.group(hypergraphTypeSyncApi, 'SchemaStreamGroup', handlers => handlers.handle('HypergraphSchemaEventStream', () => Effect.gen(function* () {
+})))).add(HttpApiEndpoint.post('SyncHypergraphSchema')`/schema/sync`.setPayload(Model.TypesyncHypergraphSchema).addSuccess(Model.TypesyncHypergraphSchema).addError(HttpApiError.InternalServerError).addError(HttpApiError.BadRequest)).add(HttpApiEndpoint.post('SyncHypergraphMapping')`/mapping/sync`.setPayload(Schema.Struct({
+  schema: Model.TypesyncHypergraphSchema,
+  mapping: Model.TypesyncHypergraphMapping
+})).addSuccess(Model.TypesyncHypergraphSchema).addError(HttpApiError.InternalServerError).addError(HttpApiError.BadRequest)).prefix('/v1') {}
+class HypergraphTypesyncStudioApi extends /*#__PURE__*/HttpApi.make('HypergraphTypesyncStudioApi').add(HypergraphTypesyncStudioApiRouter).prefix('/api') {}
+const hypergraphTypeSyncApiLive = /*#__PURE__*/HttpApiBuilder.group(HypergraphTypesyncStudioApi, 'HypergraphTypesyncStudioApiRouter', handlers => Effect.gen(function* () {
   const schemaStream = yield* Typesync.TypesyncSchemaStreamBuilder;
-  const stream = yield* schemaStream.hypergraphSchemaStream().pipe(Effect.catchAll(() => new HttpApiError.InternalServerError()));
-  return yield* HttpServerResponse.stream(stream, {
-    contentType: 'text/event-stream'
-  }).pipe(HttpServerResponse.setHeaders({
-    'Content-Type': 'text/event-stream',
-    'Cache-Control': 'no-cache',
-    Connection: 'keep-alive'
-  }));
-})));
-const HypergraphTypeSyncApiLive = /*#__PURE__*/HttpApiBuilder.api(hypergraphTypeSyncApi).pipe(/*#__PURE__*/Layer.provide(hypergraphTypeSyncApiLive), /*#__PURE__*/Layer.provide(Typesync.layer));
-const HypergraphTypeSyncApiLayer = /*#__PURE__*/HttpApiBuilder.serve(HttpMiddleware.logger).pipe(/*#__PURE__*/Layer.provide(/*#__PURE__*/HttpApiBuilder.middlewareCors()), /*#__PURE__*/Layer.provide(HypergraphTypeSyncApiLive));
+  return handlers.handle('HypergraphSchemaEventStream', () => Effect.gen(function* () {
+    const stream = yield* schemaStream.hypergraphSchemaStream().pipe(Effect.tapErrorCause(cause => Effect.logError(AnsiDoc.cat(AnsiDoc.text('Failure building Hypergraph events stream:'), AnsiDoc.text(Cause.pretty(cause))))), Effect.catchAll(() => new HttpApiError.InternalServerError()));
+    return yield* HttpServerResponse.stream(stream, {
+      contentType: 'text/event-stream'
+    }).pipe(HttpServerResponse.setHeaders({
+      'Content-Type': 'text/event-stream',
+      'Cache-Control': 'no-cache',
+      Connection: 'keep-alive'
+    }));
+  })).handle('SyncHypergraphSchema', ({
+    payload
+  }) => schemaStream.syncSchema(payload).pipe(Effect.tapErrorCause(cause => Effect.logError(AnsiDoc.cat(AnsiDoc.text('Failure syncing Hypergraph Schema:'), AnsiDoc.text(Cause.pretty(cause))))), Effect.catchAll(() => new HttpApiError.InternalServerError()))).handle('SyncHypergraphMapping', ({
+    payload
+  }) => schemaStream.syncMapping(payload.schema, payload.mapping).pipe(Effect.tapErrorCause(cause => Effect.logError(AnsiDoc.cat(AnsiDoc.text('Failure syncing Hypergraph mapping:'), AnsiDoc.text(Cause.pretty(cause))))), Effect.catchAll(() => new HttpApiError.InternalServerError())));
+}));
+const HypergraphTypeSyncApiLayer = /*#__PURE__*/HttpApiBuilder.middlewareCors({
+  allowedMethods: ['GET', 'POST', 'OPTIONS'],
+  allowedOrigins: ['http://localhost:3000', 'http://localhost:5173']
+}).pipe(/*#__PURE__*/Layer.provideMerge(/*#__PURE__*/HttpApiBuilder.api(HypergraphTypesyncStudioApi)), /*#__PURE__*/Layer.provide(Typesync.layer), /*#__PURE__*/Layer.provide(hypergraphTypeSyncApiLive));
+const HypergraphTypeSyncApiLive = /*#__PURE__*/HttpApiBuilder.httpApp.pipe(/*#__PURE__*/Effect.provide(/*#__PURE__*/Layer.mergeAll(HypergraphTypeSyncApiLayer, HttpApiBuilder.Router.Live, HttpApiBuilder.Middleware.layer)));
+const TypesyncStudioFileRouter = /*#__PURE__*/Effect.gen(function* () {
+  const fs = yield* FileSystem.FileSystem;
+  const path = yield* Path.Path;
+  const __filename = fileURLToPath(import.meta.url);
+  const __dirname = path.dirname(__filename);
+  // Try multiple possible locations for the dist directory
+  const possiblePaths = [
+  // npm published package (when this file is in node_modules/@graphprotocol/hypergraph/dist/cli/subcommands/)
+  path.resolve(__dirname, '..', '..', 'typesync-studio', 'dist'),
+  // Development mode (when this file is in packages/hypergraph/src/cli/subcommands/)
+  path.resolve(__dirname, '..', '..', '..', 'typesync-studio', 'dist')];
+  const findTypesyncStudioDist = Effect.fnUntraced(function* () {
+    return yield* Effect.findFirst(possiblePaths, _ => fs.exists(_).pipe(Effect.orElseSucceed(() => false)));
+  });
+  const typesyncStudioClientDist = yield* findTypesyncStudioDist().pipe(
+  // default to first path
+  Effect.map(maybe => Option.getOrElse(maybe, () => possiblePaths[0])));
+  return HttpRouter.empty.pipe(HttpRouter.get('/', HttpServerResponse.file(path.join(typesyncStudioClientDist, 'index.html')).pipe(Effect.orElse(() => HttpServerResponse.empty({
+    status: 404
+  })))), HttpRouter.get('/assets/:file', Effect.gen(function* () {
+    const file = yield* HttpRouter.params.pipe(Effect.map(Struct.get('file')), Effect.map(Option.fromNullable));
+    if (Option.isNone(file)) {
+      return HttpServerResponse.empty({
+        status: 404
+      });
+    }
+    const assets = path.join(typesyncStudioClientDist, 'assets');
+    const normalized = path.normalize(path.join(assets, ...file.value.split('/')));
+    if (!normalized.startsWith(assets)) {
+      return HttpServerResponse.empty({
+        status: 404
+      });
+    }
+    return yield* HttpServerResponse.file(normalized);
+  }).pipe(Effect.orElse(() => HttpServerResponse.empty({
+    status: 404
+  })))));
+});
+const Server = /*#__PURE__*/Effect.all({
+  api: HypergraphTypeSyncApiLive,
+  files: TypesyncStudioFileRouter
+}).pipe(/*#__PURE__*/Effect.map(({
+  api,
+  files
+}) => HttpRouter.empty.pipe(HttpRouter.mount('/', files), HttpRouter.mountApp('/api', api, {
+  includePrefix: true
+}))), /*#__PURE__*/Effect.map(router => HttpServer.serve(HttpMiddleware.logger)(router)), Layer.unwrapEffect);
+const openBrowser = (port, browser) => Effect.async(resume => {
+  const url = `http://localhost:${port}`;
+  const launch = appOpts => open(url, appOpts ? {
+    app: appOpts
+  } : undefined).then(subprocess => {
+    subprocess.on('spawn', () => resume(Effect.void));
+    subprocess.on('error', err => resume(Effect.fail(new OpenBrowserError({
+      cause: err
+    }))));
+  });
+  const mapBrowserName = b => {
+    switch (b) {
+      case 'chrome':
+        return apps.chrome;
+      // cross-platform alias from open
+      case 'firefox':
+        return apps.firefox;
+      case 'edge':
+        return apps.edge;
+      case 'safari':
+        return 'Safari';
+      case 'arc':
+        return 'Arc';
+      default:
+        return undefined;
+    }
+  };
+  switch (browser) {
+    case 'browser':
+      launch();
+      break;
+    case 'browserPrivate':
+      launch({
+        name: apps.browserPrivate
+      });
+      break;
+    default:
+      {
+        const mapped = mapBrowserName(browser);
+        if (mapped) {
+          launch({
+            name: mapped
+          }).catch(() => launch());
+          break;
+        }
+        launch();
+        break;
+      }
+  }
+});
+export class OpenBrowserError extends /*#__PURE__*/Data.TaggedError('Nozzle/cli/studio/errors/OpenBrowserError') {}
 export const typesync = /*#__PURE__*/Command.make('typesync', {
   args: {
-    port: Options.integer('port').pipe(Options.withAlias('p'), Options.withDefault(3000), Options.withDescription('The port to run the Hypergraph TypeSync studio server on. Default 3000'))
+    open: Options.boolean('open').pipe(Options.withDescription('If true, opens the nozzle dataset studio in your browser'), Options.withDefault(true)),
+    browser: Options.choice('browser', ['chrome', 'firefox', 'edge', 'safari', 'arc', 'browser', 'browserPrivate']).pipe(Options.withAlias('b'), Options.withDescription('Broweser to open the nozzle dataset studio app in. Default is your default selected browser'), Options.withDefault('browser'))
   }
 }).pipe(/*#__PURE__*/Command.withDescription('Opens the TypeSync studio to help users build and publish their Hypergraph application schema'), /*#__PURE__*/Command.withHandler(({
   args
 }) => Effect.gen(function* () {
-  yield* HypergraphTypeSyncApiLayer.pipe(HttpServer.withLogAddress, Layer.provide(NodeHttpServer.layer(createServer, {
-    port: args.port
-  })), Layer.tap(() => Effect.logInfo(AnsiDoc.text(`🎉 TypeSync studio started and running at http://localhost:${args.port}`))), Layer.launch);
-})));
+  yield* Server.pipe(HttpServer.withLogAddress, Layer.provide(NodeHttpServer.layer(createServer, {
+    port: 3000
+  })), Layer.tap(() => Effect.gen(function* () {
+    if (args.open) {
+      return yield* openBrowser(3000, args.browser).pipe(Effect.tapErrorCause(cause => Effect.logWarning(AnsiDoc.text('Failure opening nozzle dataset studio in your browser. Open at http://localhost:3000'), AnsiDoc.text(Cause.pretty(cause)))), Effect.orElseSucceed(() => Effect.void));
+    }
+    return Effect.void;
+  })), Layer.tap(() => Effect.logInfo(AnsiDoc.text('🎉 TypeSync studio started and running at http://localhost:3000'))), Layer.launch);
+})), /*#__PURE__*/Command.provide(Typesync.layer));
 //# sourceMappingURL=typesync.js.map

package/dist/cli/subcommands/typesync.js.map

@@ -1 +1 @@
-{"version":3,"file":"typesync.js","names":["createServer","Command","Options","HttpApi","HttpApiBuilder","HttpApiEndpoint","HttpApiError","HttpApiGroup","HttpApiSchema","HttpMiddleware","HttpServer","HttpServerResponse","NodeHttpServer","AnsiDoc","Effect","Layer","Schema","Typesync","hypergraphTypeSyncApi","make","add","get","addError","InternalServerError","addSuccess","String","pipe","withEncoding","kind","contentType","prefix","hypergraphTypeSyncApiLive","group","handlers","handle","gen","schemaStream","TypesyncSchemaStreamBuilder","stream","hypergraphSchemaStream","catchAll","setHeaders","Connection","HypergraphTypeSyncApiLive","api","provide","layer","HypergraphTypeSyncApiLayer","serve","logger","middlewareCors","typesync","args","port","integer","withAlias","withDefault","withDescription","withHandler","withLogAddress","tap","logInfo","text","launch"],"sources":["../../../src/cli/subcommands/typesync.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"typesync.js","names":["createServer","fileURLToPath","Command","Options","FileSystem","HttpApi","HttpApiBuilder","HttpApiEndpoint","HttpApiError","HttpApiGroup","HttpApiSchema","HttpMiddleware","HttpRouter","HttpServer","HttpServerResponse","Path","NodeHttpServer","AnsiDoc","Cause","Data","Effect","Layer","Option","Schema","Struct","open","apps","Model","Typesync","HypergraphTypesyncStudioApiRouter","make","add","get","addError","InternalServerError","addSuccess","String","pipe","withEncoding","kind","contentType","post","setPayload","TypesyncHypergraphSchema","BadRequest","schema","mapping","TypesyncHypergraphMapping","prefix","HypergraphTypesyncStudioApi","hypergraphTypeSyncApiLive","group","handlers","gen","schemaStream","TypesyncSchemaStreamBuilder","handle","stream","hypergraphSchemaStream","tapErrorCause","cause","logError","cat","text","pretty","catchAll","setHeaders","Connection","payload","syncSchema","syncMapping","HypergraphTypeSyncApiLayer","middlewareCors","allowedMethods","allowedOrigins","provideMerge","api","provide","layer","HypergraphTypeSyncApiLive","httpApp","mergeAll","Router","Live","Middleware","TypesyncStudioFileRouter","fs","path","__filename","import","meta","url","__dirname","dirname","possiblePaths","resolve","findTypesyncStudioDist","fnUntraced","findFirst","_","exists","orElseSucceed","typesyncStudioClientDist","map","maybe","getOrElse","empty","file","join","orElse","status","params","fromNullable","isNone","assets","normalized","normalize","value","split","startsWith","Server","all","files","mount","mountApp","includePrefix","router","serve","logger","unwrapEffect","openBrowser","port","browser","async","resume","launch","appOpts","app","undefined","then","subprocess","on","void","err","fail","OpenBrowserError","mapBrowserName","b","chrome","firefox","edge","name","browserPrivate","mapped","catch","TaggedError","typesync","args","boolean","withDescription","withDefault","choice","withAlias","withHandler","withLogAddress","tap","logWarning","logInfo"],"sources":["../../../src/cli/subcommands/typesync.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/entity/findMany.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findMany.d.ts","sourceRoot":"","sources":["../../src/entity/findMany.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAS,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAQxC,OAAO,KAAK,EACV,YAAY,EAEZ,eAAe,EACf,MAAM,EACN,iBAAiB,EACjB,YAAY,EAGb,MAAM,YAAY,CAAC;AAwNpB;;GAEG;AACH,wBAAgB,QAAQ,CAAC,KAAK,CAAC,CAAC,SAAS,YAAY,EACnD,MAAM,EAAE,SAAS,CAAC,eAAe,CAAC,EAClC,IAAI,EAAE,CAAC,EACP,MAAM,EAAE,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,EACvD,OAAO,EAAE;KAAG,CAAC,IAAI,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;CAAE,GAAG,SAAS,GAClG;IAAE,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAAC,gBAAgB,EAAE,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;CAAE,CAsIrF;AAID,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS,YAAY,IAAI;IACzD,SAAS,EAAE,CAAC,QAAQ,EAAE,MAAM,IAAI,KAAK,MAAM,IAAI,CAAC;IAChD,WAAW,EAAE,MAAM,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAC/C,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,KAAK,CAAC,CAAC,SAAS,YAAY,EAC9D,MAAM,EAAE,SAAS,CAAC,eAAe,CAAC,EAClC,IAAI,EAAE,CAAC,EACP,MAAM,EAAE;KAAG,CAAC,IAAI,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAAE,GAAG,SAAS,EACxG,OAAO,EAAE;KAAG,CAAC,IAAI,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;CAAE,GAAG,SAAS,GAClG,oBAAoB,CAAC,CAAC,CAAC,CAyHzB"}
+{"version":3,"file":"findMany.d.ts","sourceRoot":"","sources":["../../src/entity/findMany.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAS,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAQxC,OAAO,KAAK,EACV,YAAY,EAEZ,eAAe,EACf,MAAM,EACN,iBAAiB,EACjB,YAAY,EAGb,MAAM,YAAY,CAAC;AAwNpB;;GAEG;AACH,wBAAgB,QAAQ,CAAC,KAAK,CAAC,CAAC,SAAS,YAAY,EACnD,MAAM,EAAE,SAAS,CAAC,eAAe,CAAC,EAClC,IAAI,EAAE,CAAC,EACP,MAAM,EAAE,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,EACvD,OAAO,EAAE;KAAG,CAAC,IAAI,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;CAAE,GAAG,SAAS,GAClG;IAAE,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAAC,gBAAgB,EAAE,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;CAAE,CAkJrF;AAID,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS,YAAY,IAAI;IACzD,SAAS,EAAE,CAAC,QAAQ,EAAE,MAAM,IAAI,KAAK,MAAM,IAAI,CAAC;IAChD,WAAW,EAAE,MAAM,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAC/C,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,KAAK,CAAC,CAAC,SAAS,YAAY,EAC9D,MAAM,EAAE,SAAS,CAAC,eAAe,CAAC,EAClC,IAAI,EAAE,CAAC,EACP,MAAM,EAAE;KAAG,CAAC,IAAI,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAAE,GAAG,SAAS,EACxG,OAAO,EAAE;KAAG,CAAC,IAAI,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;CAAE,GAAG,SAAS,GAClG,oBAAoB,CAAC,CAAC,CAAC,CAyHzB"}

package/dist/entity/findMany.js

@@ -213,18 +213,10 @@ export function findMany(handle, type, filter, include) {
   const corruptEntityIds = [];
   const filtered = [];
   const evaluateFilter = (fieldFilter, fieldValue) => {
-    // Handle NOT operator
-    if ('not' in fieldFilter && fieldFilter.not) {
-      return !evaluateFilter(fieldFilter.not, fieldValue);
+    if ('not' in fieldFilter || 'or' in fieldFilter) {
+      throw new Error("Logical operators 'not', 'or' are only allowed at the root (cross-field) level.");
     }
-    // Handle OR operator
-    if ('or' in fieldFilter) {
-      const orFilters = fieldFilter.or;
-      if (Array.isArray(orFilters)) {
-        return orFilters.some(orFilter => evaluateFilter(orFilter, fieldValue));
-      }
-    }
-    // Handle basic filters
+    // handle basic filters
     if ('is' in fieldFilter) {
       if (typeof fieldValue === 'boolean') {
         return fieldValue === fieldFilter.is;
@@ -273,13 +265,25 @@ export function findMany(handle, type, filter, include) {
     return true;
   };
   const evaluateCrossFieldFilter = (crossFieldFilter, entity) => {
+    // evaluate regular field filters with AND semantics
     for (const fieldName in crossFieldFilter) {
+      if (fieldName === 'or' || fieldName === 'not') continue;
       const fieldFilter = crossFieldFilter[fieldName];
+      if (!fieldFilter) continue;
       const fieldValue = entity[fieldName];
-      if (fieldFilter && !evaluateFilter(fieldFilter, fieldValue)) {
+      if (!evaluateFilter(fieldFilter, fieldValue)) {
         return false;
       }
     }
+    // evaluate nested OR at cross-field level (if present)
+    if (Array.isArray(crossFieldFilter.or)) {
+      const orSatisfied = crossFieldFilter.or.some(orFilter => evaluateCrossFieldFilter(orFilter, entity));
+      if (!orSatisfied) return false;
+    }
+    // evaluate nested NOT at cross-field level (if present)
+    if (crossFieldFilter.not && evaluateCrossFieldFilter(crossFieldFilter.not, entity)) {
+      return false;
+    }
     return true;
   };
   const evaluateEntityFilter = (entityFilter, entity) => {
@@ -318,7 +322,11 @@ export function findMany(handle, type, filter, include) {
           decoded.__schema = type;
           filtered.push(decoded);
         }
-      } catch (_error) {
+      } catch (error) {
+        // rethrow in case it's filter error
+        if (error instanceof Error && error.message.includes("Logical operators 'not', 'or' are only allowed at the root (cross-field) level")) {
+          throw error;
+        }
         corruptEntityIds.push(id);
       }
     }