Tavano/revert (#844)

* Revert "Migrate to use deco from JSR (#770)"

This reverts commit 6aa83a0.

* fmt

admin/types.ts

@@ -0,0 +1,48 @@
+import { type Resolvable } from "deco/engine/core/resolver.ts";
+import { type fjp } from "./deps.ts";
+
+export interface Pagination<T> {
+  data: T[];
+  page: number;
+  pageSize: number;
+  total: number;
+}
+
+export interface PatchState {
+  type: "patch-state";
+  payload: fjp.Operation[];
+  revision: string;
+}
+
+export interface FetchState {
+  type: "fetch-state";
+}
+
+export interface StatePatched {
+  type: "state-patched";
+  payload: fjp.Operation[];
+  revision: string;
+  // Maybe add data and user info in here
+  metadata?: unknown;
+}
+
+export interface StateFetched {
+  type: "state-fetched";
+  payload: State;
+}
+
+export interface OperationFailed {
+  type: "operation-failed";
+  code: "UNAUTHORIZED" | "INTERNAL_SERVER_ERROR";
+  reason: string;
+}
+
+export type Acked<T> = T & { ack: string };
+
+export interface State {
+  decofile: Record<string, Resolvable>;
+  revision: string;
+}
+
+export type Commands = PatchState | FetchState;
+export type Events = StatePatched | StateFetched | OperationFailed;

ai-assistants/actions/awsUploadImage.ts

@@ -1,7 +1,9 @@
-import { logger, meter, ValueType } from "@deco/deco/o11y";
-import { AppContext } from "../mod.ts";
-import { AssistantIds } from "../types.ts";
+import { logger } from "deco/observability/otel/config.ts";
+import { meter } from "deco/observability/otel/metrics.ts";
 import base64ToBlob from "../utils/blobConversion.ts";
+import { AssistantIds } from "../types.ts";
+import { ValueType } from "deco/deps.ts";
+import { AppContext } from "../mod.ts";
 
 const stats = {
   awsUploadImageError: meter.createCounter("assistant_aws_upload_error", {

ai-assistants/actions/chat.ts

@@ -1,6 +1,6 @@
 import { AppContext } from "../mod.ts";
 
-import { badRequest, notFound } from "@deco/deco";
+import { badRequest, notFound } from "deco/mod.ts";
 import { messageProcessorFor } from "../chat/messages.ts";
 import { Notify, Queue } from "../deps.ts";
 

ai-assistants/actions/describeImage.ts

@@ -1,7 +1,9 @@
-import { shortcircuit } from "@deco/deco";
-import { logger, meter, ValueType } from "@deco/deco/o11y";
-import { AppContext } from "../mod.ts";
+import { logger } from "deco/observability/otel/config.ts";
+import { meter } from "deco/observability/otel/metrics.ts";
 import { AssistantIds } from "../types.ts";
+import { ValueType } from "deco/deps.ts";
+import { AppContext } from "../mod.ts";
+import { shortcircuit } from "deco/engine/errors.ts";
 
 const stats = {
   promptTokens: meter.createHistogram("assistant_image_prompt_tokens", {

ai-assistants/actions/transcribeAudio.ts

@@ -1,7 +1,9 @@
-import { logger, meter, ValueType } from "@deco/deco/o11y";
-import { AppContext } from "../mod.ts";
-import { AssistantIds } from "../types.ts";
+import { logger } from "deco/observability/otel/config.ts";
 import base64ToBlob from "../utils/blobConversion.ts";
+import { meter } from "deco/observability/otel/metrics.ts";
+import { AssistantIds } from "../types.ts";
+import { ValueType } from "deco/deps.ts";
+import { AppContext } from "../mod.ts";
 
 const stats = {
   audioSize: meter.createHistogram("assistant_transcribe_audio_size", {

ai-assistants/chat/messages.ts

@@ -1,13 +1,13 @@
-import { weakcache } from "../../utils/weakcache.ts";
 import {
   AssistantCreateParams,
   RequiredActionFunctionToolCall,
   Thread,
 } from "../deps.ts";
 import { threadMessageToReply, Tokens } from "../loaders/messages.ts";
-
-import { Context, JSONSchema7, lazySchemaFor } from "@deco/deco";
-import { meter, ValueType } from "@deco/deco/o11y";
+import { JSONSchema7, ValueType, weakcache } from "deco/deps.ts";
+import { lazySchemaFor } from "deco/engine/schema/lazy.ts";
+import { Context } from "deco/live.ts";
+import { meter } from "deco/observability/otel/metrics.ts";
 import {
   ChatMessage,
   FunctionCallReply,

ai-assistants/mod.ts

@@ -1,20 +1,17 @@
-import type { App, AppContext as AC } from "@deco/deco";
-import {
-  AppManifest,
-  asResolved,
-  AvailableActions,
-  AvailableLoaders,
-  isDeferred,
-} from "@deco/deco";
-import { isAwaitable } from "@deco/deco/utils";
 import AWS from "https://esm.sh/[email protected]";
+import { asResolved, isDeferred } from "deco/engine/core/resolver.ts";
+import { isAwaitable } from "deco/engine/core/utils.ts";
+import type { App, AppContext as AC } from "deco/mod.ts";
+import { AvailableActions, AvailableLoaders } from "deco/utils/invoke.types.ts";
+import { AppManifest } from "deco/types.ts";
+import { deferred } from "std/async/deferred.ts";
 import openai, {
   Props as OpenAIProps,
   State as OpenAIState,
 } from "../openai/mod.ts";
-import { Secret } from "../website/loaders/secret.ts";
 import { Assistant } from "./deps.ts";
 import manifest, { Manifest } from "./manifest.gen.ts";
+import { Secret } from "../website/loaders/secret.ts";
 import { PreviewContainer } from "../utils/preview.tsx";
 
 export type GPTModel =
@@ -160,7 +157,7 @@ export default function App(
       ...openAIApp.state,
       assistants: (state.assistants ?? []).filter(Boolean).reduce(
         (acc, assistant) => {
-          const assistantDeferred = Promise.withResolvers<AIAssistant>();
+          const assistantDeferred = deferred<AIAssistant>();
           if (isDeferred<AIAssistant>(assistant)) {
             const aiAssistant = assistant();
             if (isAwaitable(aiAssistant)) {

ai-assistants/runtime.ts

@@ -1,4 +1,4 @@
-import { proxy } from "@deco/deco/web";
+import { proxy } from "deco/clients/withManifest.ts";
 import { Manifest } from "./manifest.gen.ts";
 
 export const invoke = proxy<Manifest>();

ai-assistants/schema.ts

@@ -1,4 +1,4 @@
-import { JSONSchema7 } from "@deco/deco";
+import { JSONSchema7 } from "deco/deps.ts";
 
 const isJSONSchema = (
   v: unknown | JSONSchema7,

ai-assistants/utils/blobConversion.ts

@@ -1,4 +1,4 @@
-import { logger } from "@deco/deco/o11y";
+import { logger } from "deco/observability/otel/config.ts";
 import { AssistantIds } from "../types.ts";
 
 export default function base64ToBlob(

algolia/mod.ts

@@ -1,4 +1,4 @@
-import type { App, AppContext as AC } from "@deco/deco";
+import type { App, AppContext as AC } from "deco/mod.ts";
 import algolia from "https://esm.sh/[email protected]";
 import { createFetchRequester } from "npm:@algolia/[email protected]";
 import { Markdown } from "../decohub/components/Markdown.tsx";

algolia/sections/Analytics/Algolia.tsx

@@ -1,5 +1,5 @@
-import { SectionProps } from "@deco/deco";
-import { useScriptAsDataURI } from "@deco/deco/hooks";
+import { SectionProps } from "deco/blocks/section.ts";
+import { useScriptAsDataURI } from "deco/hooks/useScript.ts";
 import insights from "npm:[email protected]";
 import {
   AddToCartEvent,

algolia/workflows/index/product.ts

@@ -1,5 +1,4 @@
-import { WorkflowGen } from "@deco/deco";
-import { WorkflowContext } from "@deco/deco/blocks";
+import { WorkflowContext, WorkflowGen } from "deco/mod.ts";
 import { Product } from "../../../commerce/types.ts";
 import type { Manifest } from "../../manifest.gen.ts";
 

analytics/components/DecoAnalytics.tsx

@@ -1,5 +1,5 @@
 import { Head } from "$fresh/runtime.ts";
-import { useScriptAsDataURI } from "@deco/deco/hooks";
+import { useScriptAsDataURI } from "deco/hooks/useScript.ts";
 
 export interface Props {
   /**

analytics/loaders/DecoAnalyticsScript.ts

@@ -1,5 +1,5 @@
-import { Flag } from "@deco/deco";
-import { useScriptAsDataURI } from "@deco/deco/hooks";
+import { useScriptAsDataURI } from "deco/hooks/useScript.ts";
+import { Flag } from "deco/types.ts";
 import { Script } from "../../website/types.ts";
 import { AppContext } from "../mod.ts";
 

analytics/mod.ts

@@ -1,4 +1,4 @@
-import type { App, AppContext as AC } from "@deco/deco";
+import type { App, AppContext as AC } from "deco/mod.ts";
 import manifest, { Manifest } from "./manifest.gen.ts";
 import { PreviewContainer } from "../utils/preview.tsx";
 

anthropic/actions/code.ts

@@ -1,6 +1,6 @@
-import { shortcircuit } from "@deco/deco";
-import { Anthropic } from "../deps.ts";
+import { shortcircuit } from "deco/engine/errors.ts";
 import { AppContext } from "../mod.ts";
+import { Anthropic } from "../deps.ts";
 export interface Props {
   /**
    * @description The system prompt to be used for the AI Assistant.

anthropic/actions/stream.ts

@@ -1,5 +1,8 @@
-import { Context, JSONSchema7, lazySchemaFor, shortcircuit } from "@deco/deco";
-import { readFromStream } from "@deco/deco/utils";
+import { JSONSchema7 } from "deco/deps.ts";
+import { shortcircuit } from "deco/engine/errors.ts";
+import { lazySchemaFor } from "deco/engine/schema/lazy.ts";
+import { Context } from "deco/live.ts";
+import { readFromStream } from "deco/utils/http.ts";
 import { dereferenceJsonSchema } from "../../ai-assistants/schema.ts";
 import { Anthropic } from "../deps.ts";
 import { AppContext } from "../mod.ts";

anthropic/mod.ts

@@ -1,4 +1,4 @@
-import type { App, AppContext as AC } from "@deco/deco";
+import type { App, AppContext as AC } from "deco/mod.ts";
 import { Secret } from "../website/loaders/secret.ts";
 import { Anthropic } from "./deps.ts";
 import manifest, { Manifest } from "./manifest.gen.ts";

blog/loaders/Author.ts

@@ -1,4 +1,4 @@
-import type { Author } from "../types.ts";
+import { Author } from "../types.ts";
 
 /**
  * @title Author

blog/loaders/BlogPostItem.ts

@@ -1,5 +1,5 @@
-import type { AppContext } from "../mod.ts";
-import type { BlogPost } from "../types.ts";
+import { AppContext } from "../mod.ts";
+import { BlogPost } from "../types.ts";
 import { getRecordsByPath } from "../utils/records.ts";
 import type { RequestURLParam } from "../../website/functions/requestToParam.ts";
 

blog/loaders/BlogPostPage.ts

@@ -1,5 +1,5 @@
-import type { AppContext } from "../mod.ts";
-import type { BlogPost, BlogPostPage } from "../types.ts";
+import { AppContext } from "../mod.ts";
+import { BlogPost, BlogPostPage } from "../types.ts";
 import { getRecordsByPath } from "../utils/records.ts";
 import type { RequestURLParam } from "../../website/functions/requestToParam.ts";
 

blog/loaders/Blogpost.ts

@@ -1,4 +1,4 @@
-import type { BlogPost } from "../types.ts";
+import { BlogPost } from "../types.ts";
 
 /**
  * @title Blogpost

blog/loaders/BlogpostList.ts

@@ -6,9 +6,9 @@
  * @param ctx - The application context.
  * @returns A promise that resolves to an array of blog posts.
  */
-import type { AppContext } from "../mod.ts";
-import type { RequestURLParam } from "../../website/functions/requestToParam.ts";
-import type { BlogPost, SortBy } from "../types.ts";
+import { RequestURLParam } from "../../website/functions/requestToParam.ts";
+import { AppContext } from "../mod.ts";
+import { BlogPost, SortBy } from "../types.ts";
 import handlePosts, { slicePosts } from "../utils/handlePosts.ts";
 import { getRecordsByPath } from "../utils/records.ts";
 

blog/loaders/BlogpostListing.ts

@@ -6,10 +6,10 @@
  * @param ctx - The application context.
  * @returns A promise that resolves to an array of blog posts.
  */
-import type { PageInfo } from "../../commerce/types.ts";
-import type { RequestURLParam } from "../../website/functions/requestToParam.ts";
-import type { AppContext } from "../mod.ts";
-import type { BlogPost, BlogPostListingPage, SortBy } from "../types.ts";
+import { PageInfo } from "../../commerce/types.ts";
+import { RequestURLParam } from "../../website/functions/requestToParam.ts";
+import { AppContext } from "../mod.ts";
+import { BlogPost, BlogPostListingPage, SortBy } from "../types.ts";
 import handlePosts, { slicePosts } from "../utils/handlePosts.ts";
 import { getRecordsByPath } from "../utils/records.ts";
 

blog/loaders/Category.ts

@@ -1,4 +1,4 @@
-import type { Category } from "../types.ts";
+import { Category } from "../types.ts";
 
 /**
  * @title Category

blog/loaders/GetCategories.ts

@@ -6,9 +6,9 @@
  * @param ctx - The application context.
  * @returns A promise that resolves to an array of blog posts.
  */
-import type { RequestURLParam } from "../../website/functions/requestToParam.ts";
-import type { AppContext } from "../mod.ts";
-import type { Category } from "../types.ts";
+import { RequestURLParam } from "../../website/functions/requestToParam.ts";
+import { AppContext } from "../mod.ts";
+import { Category } from "../types.ts";
 import { getRecordsByPath } from "../utils/records.ts";
 
 const COLLECTION_PATH = "collections/blog/categories";

blog/mod.ts

@@ -1,5 +1,5 @@
-import type { App, FnContext } from "@deco/deco";
-import manifest, { type Manifest } from "./manifest.gen.ts";
+import type { App, FnContext } from "deco/mod.ts";
+import manifest, { Manifest } from "./manifest.gen.ts";
 import { PreviewContainer } from "../utils/preview.tsx";
 
 // deno-lint-ignore no-explicit-any

blog/sections/Seo/SeoBlogPost.tsx

@@ -1,10 +1,10 @@
 import Seo from "../../../website/components/Seo.tsx";
 import {
   renderTemplateString,
-  type SEOSection,
+  SEOSection,
 } from "../../../website/components/Seo.tsx";
-import type { BlogPostPage } from "../../types.ts";
-import type { AppContext } from "../../mod.ts";
+import { BlogPostPage } from "../../types.ts";
+import { AppContext } from "../../mod.ts";
 
 export interface Props {
   /** @title Data Source */

blog/sections/Seo/SeoBlogPostListing.tsx

@@ -1,10 +1,10 @@
 import Seo from "../../../website/components/Seo.tsx";
 import {
   renderTemplateString,
-  type SEOSection,
+  SEOSection,
 } from "../../../website/components/Seo.tsx";
-import type { BlogPostListingPage } from "../../types.ts";
-import type { AppContext } from "../../mod.ts";
+import { BlogPostListingPage } from "../../types.ts";
+import { AppContext } from "../../mod.ts";
 
 export interface Props {
   /** @title Data Source */

blog/sections/Template.tsx

@@ -1,4 +1,4 @@
-import type { BlogPost } from "../types.ts";
+import { BlogPost } from "../types.ts";
 import { CSS } from "../static/css.ts";
 
 export interface Props {

blog/types.ts

@@ -1,5 +1,5 @@
-import type { ImageWidget } from "../admin/widgets.ts";
-import type { PageInfo } from "../commerce/types.ts";
+import { ImageWidget } from "../admin/widgets.ts";
+import { PageInfo } from "../commerce/types.ts";
 
 /**
  * @titleBy name

blog/utils/handlePosts.ts

@@ -1,4 +1,4 @@
-import type { BlogPost, SortBy } from "../types.ts";
+import { BlogPost, SortBy } from "../types.ts";
 import { VALID_SORT_ORDERS } from "./constants.ts";
 
 /**

blog/utils/records.ts

@@ -1,5 +1,5 @@
-import type { Resolvable } from "@deco/deco";
-import type { AppContext } from "../mod.ts";
+import { AppContext } from "../mod.ts";
+import { Resolvable } from "deco/engine/core/resolver.ts";
 
 export async function getRecordsByPath<T>(
   ctx: AppContext,

brand-assistant/loaders/assistant.ts

@@ -1,12 +1,12 @@
 // deno-lint-ignore-file ban-unused-ignore no-explicit-any
-import type { ManifestOf } from "@deco/deco/blocks";
-import { logger } from "@deco/deco/o11y";
-import { Tokens } from "../../ai-assistants/loaders/messages.ts";
+import type { ManifestOf } from "deco/mod.ts";
+import { logger } from "deco/observability/otel/config.ts";
 import type { AIAssistant, Log, Prompt } from "../../ai-assistants/mod.ts";
-import type { AssistantPersonalization } from "../../ai-assistants/types.ts";
 import type { Category, Product, Suggestion } from "../../commerce/types.ts";
 import type { Manifest as OpenAIManifest } from "../../openai/manifest.gen.ts";
 import type vtex from "../../vtex/mod.ts";
+import { Tokens } from "../../ai-assistants/loaders/messages.ts";
+import type { AssistantPersonalization } from "../../ai-assistants/types.ts";
 export interface Props {
   name: string;
   productsSample?: Product[] | null;

brand-assistant/mod.ts

@@ -1,4 +1,4 @@
-import type { App, AppContext as AC } from "@deco/deco";
+import type { App, AppContext as AC } from "deco/mod.ts";
 import manifest, { Manifest } from "./manifest.gen.ts";
 import { PreviewContainer } from "../utils/preview.tsx";