Refact: core models

.github/workflows/build.yml

@@ -72,8 +72,8 @@ jobs:
       - name: Checkout core repository
         uses: actions/checkout@v4
         with:
-          repository: goanpeca/core
-          ref: sdk/core-updates
+          repository: datalayer/core
+          ref: refact/models
           path: datalayer/core
 
       - name: Setup build environment

.gitignore

@@ -14,6 +14,7 @@ dist/
 dist-electron/
 release/
 out/
+lib/
 
 # misc
 .DS_Store

package.json

@@ -15,6 +15,7 @@
     "build": "npm run type-check && cross-env NODE_OPTIONS=--max-old-space-size=8192 electron-vite build && node scripts/fix-production-bundle.js",
     "preview": "electron-vite preview",
     "type-check": "tsc --noEmit",
+    "type-check:watch": "tsc --project tsconfig.lib.json --watch --preserveWatchOutput",
     "lint": "eslint src --max-warnings 0",
     "lint:fix": "eslint src --fix",
     "format": "prettier --write \"src/**/*.{js,jsx,ts,tsx,css,json,md}\"",
@@ -46,7 +47,7 @@
     "dist:dev-prod:linux": "cross-env ELECTRON_DEV_PROD=true npm run build && cross-env ELECTRON_DEV_PROD=true electron-builder --linux"
   },
   "dependencies": {
-    "@datalayer/core": "^0.0.13",
+    "@datalayer/core": "^0.0.14",
     "@datalayer/jupyter-lexical": "^1.0.6",
     "@datalayer/jupyter-react": "^1.1.7",
     "@datalayer/lexical-loro": "^0.1.0",

src/main/services/datalayer-sdk-bridge.ts

@@ -11,7 +11,7 @@
  */
 
 import { DatalayerClient } from '@datalayer/core/lib/client/index';
-import type { UserJSON } from '@datalayer/core/lib/client/models/User';
+import type { UserJSON } from '@datalayer/core/lib/models/UserDTO';
 import { safeStorage } from 'electron';
 import { existsSync, readFileSync, writeFileSync, unlinkSync } from 'fs';
 import { join } from 'path';

src/preload/index.ts

@@ -20,8 +20,8 @@ import type {
   NotebookJSON,
   SpaceJSON,
   LexicalJSON,
-} from '@datalayer/core/lib/client/models';
-import type { UserJSON } from '@datalayer/core/lib/client/models/User';
+} from '@datalayer/core/lib/models';
+import type { UserJSON } from '@datalayer/core/lib/models/UserDTO';
 
 /**
  * Electron API for system information and menu actions.

src/renderer/components/lexical/LexicalDocument.tsx

@@ -11,7 +11,7 @@
 
 import React, { useState, useEffect, useRef } from 'react';
 import { Box, Text, Spinner } from '@primer/react';
-import type { LexicalJSON } from '@datalayer/core/lib/client/models';
+import type { LexicalJSON } from '@datalayer/core/lib/models';
 import {
   LexicalCollaborationService,
   type LexicalCollaborationConfig,

src/renderer/components/notebook/Toolbar.tsx

@@ -28,7 +28,7 @@ import {
   PaperAirplaneIcon,
 } from '@primer/octicons-react';
 import { notebookStore2 } from '@datalayer/jupyter-react';
-import type { EnvironmentJSON } from '@datalayer/core/lib/client/models';
+import type { EnvironmentJSON } from '@datalayer/core/lib/models';
 import { RuntimeProgressBar } from '../runtime/RuntimeProgressBar';
 import { RuntimeSelector } from '../runtime/RuntimeSelector';
 import { useService } from '../../contexts/ServiceContext';

src/renderer/components/runtime/CreateRuntimeDialog.tsx

@@ -19,7 +19,7 @@ import {
   Button,
   Text,
 } from '@primer/react';
-import type { EnvironmentJSON } from '@datalayer/core/lib/client/models';
+import type { EnvironmentJSON } from '@datalayer/core/lib/models';
 
 export interface CreateRuntimeDialogProps {
   isOpen: boolean;

src/renderer/components/runtime/RuntimeToolbar.tsx

@@ -21,7 +21,7 @@ import {
   IconButton,
 } from '@primer/react';
 import { TrashIcon } from '@primer/octicons-react';
-import type { EnvironmentJSON } from '@datalayer/core/lib/client/models';
+import type { EnvironmentJSON } from '@datalayer/core/lib/models';
 import { RuntimeProgressBar } from './RuntimeProgressBar';
 import { RuntimeSelector } from './RuntimeSelector';
 import { useService } from '../../contexts/ServiceContext';

src/renderer/pages/Login.tsx

@@ -21,7 +21,7 @@ import Footer from '../components/auth/Footer';
 import Version from '../components/auth/Version';
 import { LoginFormData, LoginState } from '../../shared/types';
 import { validateLoginForm, formatLoginError } from '../utils/login';
-// UserJSON type not exported, using Record from '@datalayer/core/lib/client/models';
+// UserJSON type not exported, using Record from '@datalayer/core/lib/models';
 
 interface LoginProps {
   onUserDataFetched?: (userData: Record<string, unknown>) => void;

src/renderer/pages/Spaces.tsx

@@ -13,7 +13,7 @@
 import React, { useState, useEffect, useRef } from 'react';
 import { Box } from '@primer/react';
 import { BookIcon, FileIcon } from '@primer/octicons-react';
-import type { SpaceJSON, LexicalJSON } from '@datalayer/core/lib/client/models';
+import type { SpaceJSON, LexicalJSON } from '@datalayer/core/lib/models';
 import {
   DocumentsListProps,
   SpaceInfo,

src/renderer/services/interfaces/IRuntimeService.ts

@@ -4,7 +4,7 @@
  */
 
 import { ServiceManager } from '@jupyterlab/services';
-import { RuntimeJSON } from '@datalayer/core/lib/client/models';
+import { RuntimeJSON } from '@datalayer/core/lib/models';
 import { ILifecycle } from './ILifecycle';
 
 /**

src/renderer/services/lexicalCollaboration.ts

@@ -10,7 +10,7 @@
  * @module renderer/services/lexicalCollaboration
  */
 
-import type { LexicalJSON } from '@datalayer/core/lib/client/models';
+import type { LexicalJSON } from '@datalayer/core/lib/models';
 
 /**
  * Configuration for lexical document collaboration.

src/shared/types/document.types.ts

@@ -11,7 +11,7 @@
 
 import type { LexicalEditor } from 'lexical';
 import type { ServiceManager } from '@jupyterlab/services';
-import type { RuntimeJSON } from '@datalayer/core/lib/client/models';
+import type { RuntimeJSON } from '@datalayer/core/lib/models';
 
 /**
  * Document data structure for Lexical documents.

src/shared/types/documents.types.ts

@@ -9,10 +9,7 @@
  * @module shared/types/documents
  */
 
-import type {
-  NotebookJSON,
-  LexicalJSON,
-} from '@datalayer/core/lib/client/models';
+import type { NotebookJSON, LexicalJSON } from '@datalayer/core/lib/models';
 
 /**
  * Represents any document item (notebook or lexical) from the API.

src/shared/types/ipc.types.ts

@@ -17,10 +17,10 @@ export type {
   NotebookJSON,
   LexicalJSON,
   SpaceJSON,
-} from '@datalayer/core/lib/client/models';
-export type { UserJSON } from '@datalayer/core/lib/client/models/User';
+} from '@datalayer/core/lib/models';
+export type { UserJSON } from '@datalayer/core/lib/models/UserDTO';
 
-import type { UserJSON } from '@datalayer/core/lib/client/models/User';
+import type { UserJSON } from '@datalayer/core/lib/models/UserDTO';
 
 /**
  * Authentication state shared between main and renderer processes.

src/shared/types/notebook.types.ts

@@ -11,7 +11,7 @@
 
 import type { ServiceManager } from '@jupyterlab/services';
 import { INotebookContent } from '@jupyterlab/nbformat';
-import type { RuntimeJSON } from '@datalayer/core/lib/client/models';
+import type { RuntimeJSON } from '@datalayer/core/lib/models';
 import type { ElectronCollaborationProvider } from '../../renderer/services/electronCollaborationProvider';
 
 /**

src/shared/types/window.types.d.ts

@@ -79,7 +79,7 @@ declare global {
       onAuthStateChanged: (
         callback: (authState: {
           isAuthenticated: boolean;
-          user: import('@datalayer/core/lib/client/models').UserJSON | null;
+          user: import('@datalayer/core/lib/models').UserJSON | null;
           token: string | null;
           runUrl: string;
         }) => void
@@ -164,56 +164,54 @@ declare global {
       // Authentication
       login: (token: string) => Promise<{
         isAuthenticated: boolean;
-        user: import('@datalayer/core/lib/client/models').UserJSON;
+        user: import('@datalayer/core/lib/models').UserJSON;
         token: string;
         runUrl: string;
       }>;
       logout: () => Promise<void>;
-      whoami: () => Promise<
-        import('@datalayer/core/lib/client/models').UserJSON
-      >;
+      whoami: () => Promise<import('@datalayer/core/lib/models').UserJSON>;
       getAuthState: () => Promise<{
         isAuthenticated: boolean;
-        user: import('@datalayer/core/lib/client/models').UserJSON | null;
+        user: import('@datalayer/core/lib/models').UserJSON | null;
         token: string | null;
         runUrl: string;
       }>;
       getSpacerRunUrl: () => Promise<string>;
 
       // Environments
       listEnvironments: () => Promise<
-        import('@datalayer/core/lib/client/models').EnvironmentJSON[]
+        import('@datalayer/core/lib/models').EnvironmentJSON[]
       >;
 
       // Runtimes
       listRuntimes: () => Promise<
-        import('@datalayer/core/lib/client/models').RuntimeJSON[]
+        import('@datalayer/core/lib/models').RuntimeJSON[]
       >;
       getRuntime: (
         runtimeId: string
-      ) => Promise<import('@datalayer/core/lib/client/models').RuntimeJSON>;
+      ) => Promise<import('@datalayer/core/lib/models').RuntimeJSON>;
       createRuntime: (options: {
         environmentName: string;
         type?: string;
         givenName?: string;
         minutesLimit?: number;
-      }) => Promise<import('@datalayer/core/lib/client/models').RuntimeJSON>;
+      }) => Promise<import('@datalayer/core/lib/models').RuntimeJSON>;
       deleteRuntime: (runtimeId: string) => Promise<void>;
       terminateAllRuntimes: () => Promise<PromiseSettledResult<void>[]>;
 
       // Spaces
       listSpaces: () => Promise<
-        import('@datalayer/core/lib/client/models').SpaceJSON[]
+        import('@datalayer/core/lib/models').SpaceJSON[]
       >;
       getMySpaces: () => Promise<
-        import('@datalayer/core/lib/client/models').SpaceJSON[]
+        import('@datalayer/core/lib/models').SpaceJSON[]
       >;
       getSpaceItems: (
         spaceId: string
       ) => Promise<
         Array<
-          | import('@datalayer/core/lib/client/models').NotebookJSON
-          | import('@datalayer/core/lib/client/models').LexicalJSON
+          | import('@datalayer/core/lib/models').NotebookJSON
+          | import('@datalayer/core/lib/models').LexicalJSON
         >
       >;
       getContent: (itemId: string) => Promise<unknown>;
@@ -222,27 +220,27 @@ declare global {
       // Notebooks
       listNotebooks: (
         spaceId: string
-      ) => Promise<import('@datalayer/core/lib/client/models').NotebookJSON[]>;
+      ) => Promise<import('@datalayer/core/lib/models').NotebookJSON[]>;
       getNotebook: (
         notebookId: string
-      ) => Promise<import('@datalayer/core/lib/client/models').NotebookJSON>;
+      ) => Promise<import('@datalayer/core/lib/models').NotebookJSON>;
       createNotebook: (
         spaceId: string,
         name: string,
         description?: string
-      ) => Promise<import('@datalayer/core/lib/client/models').NotebookJSON>;
+      ) => Promise<import('@datalayer/core/lib/models').NotebookJSON>;
       updateNotebook: (
         notebookId: string,
         data: { name?: string; description?: string }
-      ) => Promise<import('@datalayer/core/lib/client/models').NotebookJSON>;
+      ) => Promise<import('@datalayer/core/lib/models').NotebookJSON>;
       deleteNotebook: (notebookId: string) => Promise<void>;
 
       // Lexical documents
       createLexical: (
         spaceId: string,
         name: string,
         description?: string
-      ) => Promise<import('@datalayer/core/lib/client/models').LexicalJSON>;
+      ) => Promise<import('@datalayer/core/lib/models').LexicalJSON>;
       deleteLexical: (lexicalId: string) => Promise<void>;
     };
   }

tsconfig.lib.json

@@ -0,0 +1,26 @@
+{
+  "$schema": "https://json.schemastore.org/tsconfig",
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./lib",
+    "rootDir": "./src",
+    "declaration": true,
+    "declarationMap": true,
+    "declarationDir": "./lib",
+    "sourceMap": true
+  },
+  "include": ["src/**/*.ts", "src/**/*.tsx"],
+  "exclude": [
+    "tests",
+    "tests/**/*",
+    "src/tests",
+    "src/tests/**/*",
+    "src/**/*.test.ts",
+    "src/**/*.test.tsx",
+    "src/**/*.spec.ts",
+    "src/**/*.spec.tsx",
+    "src/**/__tests__/**",
+    "dist",
+    "dist-electron"
+  ]
+}