Organize types

noya-app · Jan 27, 2024 · 28e31ff · 28e31ff
1 parent 17e36d9
commit 28e31ff
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 8 deletions.
diff --git a/packages/noya-compiler/src/__tests__/compile.test.ts b/packages/noya-compiler/src/__tests__/compile.test.ts
@@ -6,7 +6,6 @@ import {
   DesignSystemDefinition,
   x,
 } from '@noya-design-system/protocol';
-import { DS } from 'noya-api';
 import {
   compile,
   compileAsync,
@@ -16,6 +15,7 @@ import {
 } from 'noya-compiler';
 import {
   createResolvedNode,
+  DS,
   FindComponent,
   Model,
   renderResolvedNode,

diff --git a/packages/noya-compiler/src/compileDesignSystem.ts b/packages/noya-compiler/src/compileDesignSystem.ts
@@ -5,8 +5,8 @@ import {
   component,
   transform,
 } from '@noya-design-system/protocol';
-import { DSConfig } from 'noya-api';
 import {
+  DSConfig,
   FindComponent,
   NoyaComponent,
   NoyaResolvedNode,

diff --git a/packages/noya-compiler/src/types.ts b/packages/noya-compiler/src/types.ts
@@ -1,6 +1,5 @@
 import { DesignSystemDefinition } from '@noya-design-system/protocol';
-import { DS } from 'noya-api';
-import { NoyaComponent } from 'noya-component';
+import { DS, NoyaComponent } from 'noya-component';
 
 export interface CompilerConfiguration {
   name: string;

diff --git a/packages/noya-component/src/componentGroups.ts b/packages/noya-component/src/componentGroups.ts
@@ -1,8 +1,6 @@
 import { defineTree } from 'tree-visit';
-import { FlatGroupItem, Group, flattenGroups } from './groups';
-import { NoyaComponent } from './types';
-
-export type ComponentGroup = Group<NoyaComponent>;
+import { FlatGroupItem, flattenGroups } from './groups';
+import { ComponentGroup, NoyaComponent } from './types';
 
 export const UNCATEGORIZED = 'uncategorized';
 

diff --git a/packages/noya-component/src/types.ts b/packages/noya-component/src/types.ts
@@ -1,4 +1,33 @@
 import { ArrayDiffItem } from './arrayDiff';
+import { Group } from './groups';
+
+export type ComponentGroup = Group<NoyaComponent>;
+
+export type DSConfig = {
+  colorMode?: 'light' | 'dark';
+  colors: {
+    primary: string;
+  };
+};
+
+export type DSSource = {
+  type: 'npm';
+  name: string;
+  version: string;
+};
+
+export type DS = {
+  source: DSSource;
+  config: DSConfig;
+  components?: NoyaComponent[];
+  groups?: ComponentGroup[];
+  latestBuildAssetId?: string;
+  prompt?: {
+    inputDescription?: string;
+    pickComponent?: string;
+    populateTemplate?: string;
+  };
+};
 
 export type NoyaString = {
   id: string;