instant-cli 0.22.177 → 0.22.178

package/dist/lib/pushSchema.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pushSchema.d.ts","sourceRoot":"","sources":["../../src/lib/pushSchema.ts"],"names":[],"mappings":"AAeA,OAAO,EAAQ,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAMtD,OAAO,EAAE,iBAAiB,EAAe,MAAM,WAAW,CAAC;AAG3D,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAInD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;;;;;;;AAWpD,qBAAa,mBAAoB,SAAQ,wBAKvC;CAAG;;;;;;AAEL,qBAAa,eAAgB,SAAQ,oBAInC;CAAG;;;;;;AAEL,qBAAa,cAAe,SAAQ,mBAIlC;CAAG;;;;;;AAEL,qBAAa,qBAAsB,SAAQ,0BAIzC;CAAG;AAEL,eAAO,MAAM,UAAU,GACrB,SAAS,eAAe,CAAC,OAAO,OAAO,CAAC,CAAC,QAAQ,CAAC,ifAiIhD,CAAC;;;;;;AAEL,qBAAa,gBAAiB,SAAQ,qBAIpC;CAAG;;;;AAEL,qBAAa,iBAAkB,SAAQ,uBAAsC;IAC3E,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;CAAG"}

package/dist/lib/pushSchema.js

@@ -0,0 +1,160 @@
+import { HttpClient, HttpClientRequest, HttpClientResponse, } from '@effect/platform';
+import { apiSchemaToInstantSchemaDef, buildAutoRenameSelector, collectSystemCatalogIdentNames, convertTxSteps, diffSchemas, SchemaValidationError as PlatformSchemaError, validateSchema, } from '@instantdb/platform';
+import chalk from 'chalk';
+import { Data, Effect, Schema } from 'effect';
+import { CurrentApp } from "../context/currentApp.js";
+import { readLocalSchemaFile, resolveRenames, waitForIndexingJobsToFinish, } from '../old.js';
+import { InstantHttpAuthed, withCommand } from "./http.js";
+import boxen from 'boxen';
+import { GlobalOpts } from "../context/globalOpts.js";
+import { pushDef } from "../index.js";
+import { groupSteps, renderSchemaPlan } from "../renderSchemaPlan.js";
+import { promptOk } from "./ui.js";
+import { AuthToken } from "../context/authToken.js";
+const FetchSchemaResponse = Schema.Struct({
+    schema: Schema.Struct({
+        refs: Schema.Any,
+        blobs: Schema.Any,
+    }),
+    attrs: Schema.Array(Schema.Any).pipe(Schema.mutable),
+    'app-title': Schema.String,
+}).pipe(Schema.mutable);
+export class ReadSchemaFileError extends Schema.TaggedError('ReadSchemaFileError')('ReadSchemaFileError', {
+    message: Schema.String,
+    cause: Schema.Any.pipe(Schema.optional),
+}) {
+}
+export class SchemaDiffError extends Schema.TaggedError('SchemaDiffError')('SchemaDiffError', {
+    message: Schema.String,
+}) {
+}
+export class GetSchemaError extends Schema.TaggedError('GetSchemaError')('GetSchemaError', {
+    message: Schema.String,
+}) {
+}
+export class SchemaValidationError extends Schema.TaggedError('SchemaValidationError')('SchemaValidationError', {
+    message: Schema.String,
+}) {
+}
+export const pushSchema = (rename) => Effect.gen(function* () {
+    const localSchemaFile = yield* Effect.tryPromise({
+        try: readLocalSchemaFile,
+        catch: (e) => e instanceof Error
+            ? ReadSchemaFileError.make({ message: e.message })
+            : ReadSchemaFileError.make({ message: String(e) }),
+    });
+    if (!localSchemaFile || !localSchemaFile?.schema) {
+        return yield* ReadSchemaFileError.make({
+            message: `We couldn't find your ${chalk.yellow('`instant.schema.ts`')} file. Make sure it's in the root directory. (Hint: You can use an INSTANT_SCHEMA_FILE_PATH environment variable to specify it.)`,
+        });
+    }
+    if (localSchemaFile.schema?.constructor?.name !== 'InstantSchemaDef') {
+        return yield* SchemaValidationError.make({
+            message: `We couldn't find your schema export.\nIn your ${chalk.yellow('`instant.schema.ts`')} file, make sure you ${chalk.green('`export default schema`')}`,
+        });
+    }
+    const http = yield* InstantHttpAuthed;
+    const { appId } = yield* CurrentApp;
+    const res = yield* http
+        .pipe(withCommand('push'))
+        .get(`/dash/apps/${appId}/schema/pull`)
+        .pipe(Effect.andThen(HttpClientResponse.schemaBodyJson(FetchSchemaResponse)), Effect.mapError((e) => GetSchemaError.make({ message: e.message })));
+    const currentAttrs = res['attrs'];
+    const currentApiSchema = res['schema'];
+    const oldSchema = apiSchemaToInstantSchemaDef(currentApiSchema, {
+        disableTypeInference: true,
+    });
+    const systemCatalogIdentNames = collectSystemCatalogIdentNames(currentAttrs);
+    yield* Effect.tryPromise({
+        try: async () => validateSchema(localSchemaFile.schema, systemCatalogIdentNames),
+        catch: (e) => {
+            if (e instanceof PlatformSchemaError) {
+                return SchemaValidationError.make({
+                    message: 'Invalid Schema: ' + e.message,
+                });
+            }
+            return SchemaValidationError.make({
+                message: 'Failed to validate schema' + e,
+            });
+        },
+    });
+    const renames = rename && Array.isArray(rename) ? rename : [];
+    const globalOpts = yield* GlobalOpts;
+    const autoRenameSelector = buildAutoRenameSelector(renames);
+    const renameSelector = globalOpts.yes
+        ? autoRenameSelector
+        : async (created, promptData, extraInfo) => {
+            const autoResolved = await autoRenameSelector(created, promptData, extraInfo);
+            // If the user provided an explicit --rename match, skip the prompt.
+            if (autoResolved !== created) {
+                return autoResolved;
+            }
+            return resolveRenames(created, promptData, extraInfo);
+        };
+    const diffResult = yield* Effect.tryPromise(() => diffSchemas(oldSchema, localSchemaFile.schema, renameSelector, systemCatalogIdentNames)).pipe(Effect.mapError((e) => {
+        if (e.cause instanceof Error) {
+            return SchemaDiffError.make({ message: e.cause.message });
+        }
+        return SchemaDiffError.make({ message: e.message });
+    }));
+    const txSteps = convertTxSteps(diffResult, currentAttrs);
+    if (txSteps.length === 0) {
+        yield* Effect.log(chalk.bgGray('No schema changes to apply!'));
+        return;
+    }
+    const groupedSteps = groupSteps(diffResult);
+    yield* confirmSchemaChanges(groupedSteps, currentAttrs);
+    const pushRes = yield* http
+        .pipe(HttpClient.mapRequestInputEffect(HttpClientRequest.bodyJson({
+        steps: txSteps,
+    })))
+        .post(`/dash/apps/${appId}/schema/steps/apply`)
+        .pipe(Effect.flatMap(HttpClientResponse.schemaBodyJson(Schema.Any)));
+    yield* Effect.log(chalk.green('Schema updated!'));
+    const authToken = yield* (yield* AuthToken).getAuthToken;
+    if (pushRes?.['indexing-jobs']) {
+        // TODO: rewrite in effect
+        yield* Effect.tryPromise({
+            try: () => waitForIndexingJobsToFinish(appId, pushRes?.['indexing-jobs'] || [], authToken),
+            catch: (e) => WaitForJobsError.make({
+                message: e?.message || 'Error waiting for schema push jobs to finish',
+            }),
+        });
+    }
+});
+export class WaitForJobsError extends Schema.TaggedError('WaitForJobsError')('WaitForJobsError', {
+    message: Schema.String,
+}) {
+}
+export class CancelSchemaError extends Data.TaggedError('CancelSchemaError') {
+}
+const confirmSchemaChanges = (steps, currentAttrs) => Effect.gen(function* () {
+    const lines = renderSchemaPlan(steps, currentAttrs);
+    const globalOpts = yield* GlobalOpts;
+    if (globalOpts.yes) {
+        console.log('Applying schema changes...');
+        console.log(lines.join('\n'));
+        return;
+    }
+    const wantsToPush = yield* promptOk({
+        promptText: 'Push these changes?',
+        yesText: 'Push',
+        noText: 'Cancel',
+        modifyOutput: (output) => {
+            let both = lines.join('\n') + '\n\n' + output;
+            return boxen(both, {
+                dimBorder: true,
+                padding: {
+                    left: 1,
+                    right: 1,
+                },
+            });
+        },
+    });
+    if (!wantsToPush) {
+        return yield* new CancelSchemaError({
+            message: 'Schema Migration Cancelled',
+        });
+    }
+});
+//# sourceMappingURL=pushSchema.js.map

package/dist/lib/pushSchema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pushSchema.js","sourceRoot":"","sources":["../../src/lib/pushSchema.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  HttpClient,\n  HttpClientRequest,\n  HttpClientResponse,\n} from '@effect/platform';\nimport {\n  apiSchemaToInstantSchemaDef,\n  buildAutoRenameSelector,\n  collectSystemCatalogIdentNames,\n  convertTxSteps,\n  diffSchemas,\n  SchemaValidationError as PlatformSchemaError,\n  validateSchema,\n} from '@instantdb/platform';\nimport chalk from 'chalk';\nimport { Data, Effect, Schema } from 'effect';\nimport { CurrentApp } from '../context/currentApp.ts';\nimport {\n  readLocalSchemaFile,\n  resolveRenames,\n  waitForIndexingJobsToFinish,\n} from '../old.js';\nimport { InstantHttpAuthed, withCommand } from './http.ts';\n\nimport boxen from 'boxen';\nimport { GlobalOpts } from '../context/globalOpts.ts';\nimport { pushDef } from '../index.ts';\nimport type { OptsFromCommand } from '../index.ts';\nimport { groupSteps, renderSchemaPlan } from '../renderSchemaPlan.ts';\nimport type { SuperMigrationTx } from '../renderSchemaPlan.ts';\nimport { promptOk } from './ui.ts';\nimport { AuthToken } from '../context/authToken.ts';\n\nconst FetchSchemaResponse = Schema.Struct({\n  schema: Schema.Struct({\n    refs: Schema.Any,\n    blobs: Schema.Any,\n  }),\n  attrs: Schema.Array(Schema.Any).pipe(Schema.mutable),\n  'app-title': Schema.String,\n}).pipe(Schema.mutable);\n\nexport class ReadSchemaFileError extends Schema.TaggedError<ReadSchemaFileError>(\n  'ReadSchemaFileError',\n)('ReadSchemaFileError', {\n  message: Schema.String,\n  cause: Schema.Any.pipe(Schema.optional),\n}) {}\n\nexport class SchemaDiffError extends Schema.TaggedError<SchemaDiffError>(\n  'SchemaDiffError',\n)('SchemaDiffError', {\n  message: Schema.String,\n}) {}\n\nexport class GetSchemaError extends Schema.TaggedError<GetSchemaError>(\n  'GetSchemaError',\n)('GetSchemaError', {\n  message: Schema.String,\n}) {}\n\nexport class SchemaValidationError extends Schema.TaggedError<SchemaValidationError>(\n  'SchemaValidationError',\n)('SchemaValidationError', {\n  message: Schema.String,\n}) {}\n\nexport const pushSchema = (\n  rename?: OptsFromCommand<typeof pushDef>['rename'],\n) =>\n  Effect.gen(function* () {\n    const localSchemaFile = yield* Effect.tryPromise({\n      try: readLocalSchemaFile,\n      catch: (e) =>\n        e instanceof Error\n          ? ReadSchemaFileError.make({ message: e.message })\n          : ReadSchemaFileError.make({ message: String(e) }),\n    });\n    if (!localSchemaFile || !localSchemaFile?.schema) {\n      return yield* ReadSchemaFileError.make({\n        message: `We couldn't find your ${chalk.yellow('`instant.schema.ts`')} file. Make sure it's in the root directory. (Hint: You can use an INSTANT_SCHEMA_FILE_PATH environment variable to specify it.)`,\n      });\n    }\n    if (localSchemaFile.schema?.constructor?.name !== 'InstantSchemaDef') {\n      return yield* SchemaValidationError.make({\n        message: `We couldn't find your schema export.\\nIn your ${chalk.yellow('`instant.schema.ts`')} file, make sure you ${chalk.green('`export default schema`')}`,\n      });\n    }\n\n    const http = yield* InstantHttpAuthed;\n    const { appId } = yield* CurrentApp;\n    const res = yield* http\n      .pipe(withCommand('push'))\n      .get(`/dash/apps/${appId}/schema/pull`)\n      .pipe(\n        Effect.andThen(HttpClientResponse.schemaBodyJson(FetchSchemaResponse)),\n        Effect.mapError((e) => GetSchemaError.make({ message: e.message })),\n      );\n\n    const currentAttrs = res['attrs'];\n    const currentApiSchema = res['schema'];\n    const oldSchema = apiSchemaToInstantSchemaDef(currentApiSchema, {\n      disableTypeInference: true,\n    });\n    const systemCatalogIdentNames =\n      collectSystemCatalogIdentNames(currentAttrs);\n\n    yield* Effect.tryPromise({\n      try: async () =>\n        validateSchema(localSchemaFile.schema, systemCatalogIdentNames),\n      catch: (e) => {\n        if (e instanceof PlatformSchemaError) {\n          return SchemaValidationError.make({\n            message: 'Invalid Schema: ' + e.message,\n          });\n        }\n        return SchemaValidationError.make({\n          message: 'Failed to validate schema' + e,\n        });\n      },\n    });\n    const renames = rename && Array.isArray(rename) ? rename : [];\n    const globalOpts = yield* GlobalOpts;\n    const autoRenameSelector = buildAutoRenameSelector(renames as any);\n    const renameSelector = globalOpts.yes\n      ? autoRenameSelector\n      : async (created: any, promptData: any, extraInfo: any) => {\n          const autoResolved = await autoRenameSelector(\n            created,\n            promptData,\n            extraInfo,\n          );\n\n          // If the user provided an explicit --rename match, skip the prompt.\n          if (autoResolved !== created) {\n            return autoResolved;\n          }\n\n          return resolveRenames(created, promptData, extraInfo);\n        };\n\n    const diffResult = yield* Effect.tryPromise(() =>\n      diffSchemas(\n        oldSchema,\n        localSchemaFile.schema,\n        renameSelector,\n        systemCatalogIdentNames,\n      ),\n    ).pipe(\n      Effect.mapError((e) => {\n        if (e.cause instanceof Error) {\n          return SchemaDiffError.make({ message: e.cause.message });\n        }\n        return SchemaDiffError.make({ message: e.message });\n      }),\n    );\n\n    const txSteps = convertTxSteps(diffResult, currentAttrs);\n    if (txSteps.length === 0) {\n      yield* Effect.log(chalk.bgGray('No schema changes to apply!'));\n      return;\n    }\n\n    const groupedSteps = groupSteps(diffResult);\n    yield* confirmSchemaChanges(groupedSteps, currentAttrs);\n\n    const pushRes = yield* http\n      .pipe(\n        HttpClient.mapRequestInputEffect(\n          HttpClientRequest.bodyJson({\n            steps: txSteps,\n          }),\n        ),\n      )\n      .post(`/dash/apps/${appId}/schema/steps/apply`)\n      .pipe(Effect.flatMap(HttpClientResponse.schemaBodyJson(Schema.Any)));\n\n    yield* Effect.log(chalk.green('Schema updated!'));\n\n    const authToken = yield* (yield* AuthToken).getAuthToken;\n\n    if (pushRes?.['indexing-jobs']) {\n      // TODO: rewrite in effect\n      yield* Effect.tryPromise({\n        try: () =>\n          waitForIndexingJobsToFinish(\n            appId,\n            pushRes?.['indexing-jobs'] || [],\n            authToken,\n          ),\n        catch: (e: any) =>\n          WaitForJobsError.make({\n            message:\n              e?.message || 'Error waiting for schema push jobs to finish',\n          }),\n      });\n    }\n  });\n\nexport class WaitForJobsError extends Schema.TaggedError<WaitForJobsError>(\n  'WaitForJobsError',\n)('WaitForJobsError', {\n  message: Schema.String,\n}) {}\n\nexport class CancelSchemaError extends Data.TaggedError('CancelSchemaError')<{\n  message: string;\n}> {}\n\nconst confirmSchemaChanges = (steps: SuperMigrationTx[], currentAttrs: any[]) =>\n  Effect.gen(function* () {\n    const lines = renderSchemaPlan(steps, currentAttrs);\n    const globalOpts = yield* GlobalOpts;\n    if (globalOpts.yes) {\n      console.log('Applying schema changes...');\n      console.log(lines.join('\\n'));\n\n      return;\n    }\n    const wantsToPush = yield* promptOk({\n      promptText: 'Push these changes?',\n      yesText: 'Push',\n      noText: 'Cancel',\n      modifyOutput: (output) => {\n        let both = lines.join('\\n') + '\\n\\n' + output;\n        return boxen(both, {\n          dimBorder: true,\n          padding: {\n            left: 1,\n            right: 1,\n          },\n        });\n      },\n    });\n    if (!wantsToPush) {\n      return yield* new CancelSchemaError({\n        message: 'Schema Migration Cancelled',\n      });\n    }\n  });\n"]}

package/dist/lib/ui.d.ts

@@ -0,0 +1,16 @@
+import { Effect } from 'effect';
+import { GlobalOpts } from '../context/globalOpts.ts';
+import { Prompt } from '../ui/lib.ts';
+import { UI } from '../ui/index.ts';
+declare const UIError_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]; }) => import("effect/Cause").YieldableError & {
+    readonly _tag: "UIError";
+} & Readonly<A>;
+export declare class UIError extends UIError_base<{
+    message: string;
+    cause?: unknown;
+}> {
+}
+export declare const promptOk: (props: UI.ConfirmationProps, defaultValue?: boolean | undefined) => Effect.Effect<boolean, never, GlobalOpts>;
+export declare const runUIEffect: <P>(prompt: Prompt<P>) => Effect.Effect<P, UIError, never>;
+export {};
+//# sourceMappingURL=ui.d.ts.map

package/dist/lib/ui.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ui.d.ts","sourceRoot":"","sources":["../../src/lib/ui.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,MAAM,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,MAAM,EAAgB,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,EAAE,EAAE,MAAM,gBAAgB,CAAC;;;;AAEpC,qBAAa,OAAQ,SAAQ,aAA4B;IACvD,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;CAAG;AAEL,eAAO,MAAM,QAAQ,gHAmBnB,CAAC;AAEH,eAAO,MAAM,WAAW,GAAI,CAAC,EAAE,QAAQ,MAAM,CAAC,CAAC,CAAC,qCAI5C,CAAC"}

package/dist/lib/ui.js

@@ -0,0 +1,22 @@
+import { Data, Effect } from 'effect';
+import { GlobalOpts } from "../context/globalOpts.js";
+import { Prompt, renderUnwrap } from "../ui/lib.js";
+import { UI } from "../ui/index.js";
+export class UIError extends Data.TaggedError('UIError') {
+}
+export const promptOk = Effect.fn('promptOk')(function* (props, defaultValue = true) {
+    const opts = yield* GlobalOpts;
+    if (opts.yes) {
+        return defaultValue;
+    }
+    const ok = yield* Effect.tryPromise(() => renderUnwrap(new UI.Confirmation({
+        ...props,
+        defaultValue,
+    }))).pipe(Effect.orElseSucceed(() => defaultValue));
+    return ok;
+});
+export const runUIEffect = (prompt) => Effect.tryPromise({
+    try: () => renderUnwrap(prompt),
+    catch: (error) => new UIError({ message: 'UI Error', cause: error }),
+});
+//# sourceMappingURL=ui.js.map

package/dist/lib/ui.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ui.js","sourceRoot":"","sources":["../../src/lib/ui.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,EAAE,EAAE,MAAM,gBAAgB,CAAC;AAEpC,MAAM,OAAO,OAAQ,SAAQ,IAAI,CAAC,WAAW,CAAC,SAAS,CAGrD;CAAG;AAEL,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,EACrD,KAA2B,EAC3B,eAAwB,IAAI;IAE5B,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC;IAC/B,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;QACb,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,CACvC,YAAY,CACV,IAAI,EAAE,CAAC,YAAY,CAAC;QAClB,GAAG,KAAK;QACR,YAAY;KACb,CAAC,CACH,CACF,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IAEjD,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,WAAW,GAAG,CAAI,MAAiB,EAAE,EAAE,CAClD,MAAM,CAAC,UAAU,CAAC;IAChB,GAAG,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC;IAC/B,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,OAAO,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;CACrE,CAAC,CAAC","sourcesContent":["import { Data, Effect } from 'effect';\nimport { GlobalOpts } from '../context/globalOpts.ts';\nimport { Prompt, renderUnwrap } from '../ui/lib.ts';\nimport { UI } from '../ui/index.ts';\n\nexport class UIError extends Data.TaggedError('UIError')<{\n  message: string;\n  cause?: unknown;\n}> {}\n\nexport const promptOk = Effect.fn('promptOk')(function* (\n  props: UI.ConfirmationProps,\n  defaultValue: boolean = true,\n) {\n  const opts = yield* GlobalOpts;\n  if (opts.yes) {\n    return defaultValue;\n  }\n\n  const ok = yield* Effect.tryPromise(() =>\n    renderUnwrap(\n      new UI.Confirmation({\n        ...props,\n        defaultValue,\n      }),\n    ),\n  ).pipe(Effect.orElseSucceed(() => defaultValue));\n\n  return ok;\n});\n\nexport const runUIEffect = <P>(prompt: Prompt<P>) =>\n  Effect.tryPromise({\n    try: () => renderUnwrap(prompt),\n    catch: (error) => new UIError({ message: 'UI Error', cause: error }),\n  });\n"]}

package/dist/logging.d.ts

@@ -0,0 +1,4 @@
+export declare function warn(firstArg: string, ...rest: any[]): void;
+export declare function error(firstArg: string, ...rest: any[]): void;
+export declare const SimpleLogLayer: import("effect/Layer").Layer<never, never, never>;
+//# sourceMappingURL=logging.d.ts.map

package/dist/logging.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"logging.d.ts","sourceRoot":"","sources":["../src/logging.ts"],"names":[],"mappings":"AAGA,wBAAgB,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,QAEpD;AAED,wBAAgB,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,QAErD;AAmBD,eAAO,MAAM,cAAc,mDAG1B,CAAC"}

package/dist/logging.js

@@ -0,0 +1,17 @@
+import chalk from 'chalk';
+import { HashMap, Logger, Match, Option } from 'effect';
+export function warn(firstArg, ...rest) {
+    console.warn(chalk.yellow('[warning]') + ' ' + firstArg, ...rest);
+}
+export function error(firstArg, ...rest) {
+    console.error(chalk.red('[error]') + ' ' + firstArg, ...rest);
+}
+const simpleLogger = Logger.make(({ logLevel, message, annotations }) => {
+    const isSilent = HashMap.get(annotations, 'silent').pipe(Option.getOrNull);
+    if (isSilent)
+        return;
+    const formattedMessage = Array.isArray(message) ? message.join(' ') : message;
+    Match.value(logLevel).pipe(Match.tag('Info', () => console.log(formattedMessage)), Match.tag('Warning', () => console.warn(formattedMessage)), Match.tag('Error', () => console.error(chalk.red('[error]') + ' ' + formattedMessage)), Match.tag('Debug', () => console.debug(formattedMessage)), Match.tag('Fatal', () => console.error(chalk.red('[error]') + ' ' + formattedMessage)));
+});
+export const SimpleLogLayer = Logger.replace(Logger.defaultLogger, simpleLogger);
+//# sourceMappingURL=logging.js.map

package/dist/logging.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"logging.js","sourceRoot":"","sources":["../src/logging.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAExD,MAAM,UAAU,IAAI,CAAC,QAAgB,EAAE,GAAG,IAAW;IACnD,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,GAAG,GAAG,QAAQ,EAAE,GAAG,IAAI,CAAC,CAAC;AACpE,CAAC;AAED,MAAM,UAAU,KAAK,CAAC,QAAgB,EAAE,GAAG,IAAW;IACpD,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,GAAG,GAAG,QAAQ,EAAE,GAAG,IAAI,CAAC,CAAC;AAChE,CAAC;AAED,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE,EAAE;IACtE,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAC3E,IAAI,QAAQ;QAAE,OAAO;IACrB,MAAM,gBAAgB,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAC9E,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CACxB,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,EACtD,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,EAC1D,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE,CACtB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,GAAG,GAAG,gBAAgB,CAAC,CAC7D,EACD,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,EACzD,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE,CACtB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,GAAG,GAAG,gBAAgB,CAAC,CAC7D,CACF,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAC1C,MAAM,CAAC,aAAa,EACpB,YAAY,CACb,CAAC","sourcesContent":["import chalk from 'chalk';\nimport { HashMap, Logger, Match, Option } from 'effect';\n\nexport function warn(firstArg: string, ...rest: any[]) {\n  console.warn(chalk.yellow('[warning]') + ' ' + firstArg, ...rest);\n}\n\nexport function error(firstArg: string, ...rest: any[]) {\n  console.error(chalk.red('[error]') + ' ' + firstArg, ...rest);\n}\n\nconst simpleLogger = Logger.make(({ logLevel, message, annotations }) => {\n  const isSilent = HashMap.get(annotations, 'silent').pipe(Option.getOrNull);\n  if (isSilent) return;\n  const formattedMessage = Array.isArray(message) ? message.join(' ') : message;\n  Match.value(logLevel).pipe(\n    Match.tag('Info', () => console.log(formattedMessage)),\n    Match.tag('Warning', () => console.warn(formattedMessage)),\n    Match.tag('Error', () =>\n      console.error(chalk.red('[error]') + ' ' + formattedMessage),\n    ),\n    Match.tag('Debug', () => console.debug(formattedMessage)),\n    Match.tag('Fatal', () =>\n      console.error(chalk.red('[error]') + ' ' + formattedMessage),\n    ),\n  );\n});\n\nexport const SimpleLogLayer = Logger.replace(\n  Logger.defaultLogger,\n  simpleLogger,\n);\n"]}

package/dist/old.d.ts

@@ -0,0 +1,14 @@
+export function waitForIndexingJobsToFinish(appId: any, data: any, authToken: any): Promise<void>;
+export function readLocalPermsFile(): Promise<{
+    path: string;
+    perms: any;
+} | undefined>;
+export function readLocalSchemaFile(): Promise<{
+    path: string;
+    schema: any;
+} | undefined>;
+export function readInstantConfigFile(): Promise<any>;
+export function readConfigAuthTokenWithErrorLogging(): Promise<any>;
+export function countEntities(o: any): number;
+export function resolveRenames(created: any, promptData: any, extraInfo: any): Promise<string | import("./util/renamePrompt.ts").RenamePromptItem<string>>;
+//# sourceMappingURL=old.d.ts.map

package/dist/old.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"old.d.ts","sourceRoot":"","sources":["../src/old.js"],"names":[],"mappings":"AA6LA,kGAqFC;AAiID;;;eASC;AAED;;;eASC;AAED,sDAeC;AAoCD,oEAQC;AAQD,8CAEC;AA1NM,2JAoBN"}