@decohere/workspace 0.0.1-dev.118 → 0.0.1-dev.120

package/commonjs/src/factories/project.factory.js

@@ -10,6 +10,7 @@ Object.defineProperty(exports, "ProjectFactory", {
 });
 const _nodepath = /*#__PURE__*/ _interop_require_default(require("node:path"));
 const _io = require("@decohere/core/io");
+const _io1 = require("@decohere/devkit/io");
 const _objects = require("@decohere/core/objects");
 const _errors = require("../errors.js");
 const _packagejsonmodel = require("../models/package-json.model.js");
@@ -23,7 +24,7 @@ class ProjectFactory {
     static async getProjectSeeds(config) {
         const { includeProjects, ignoreProjects, rootDir } = config;
         const cwd = rootDir ?? "./";
-        const discoveredPackageJsonFiles = await _io.io.findFiles(includeProjects, {
+        const discoveredPackageJsonFiles = await (0, _io1.findFiles)(includeProjects, {
             cwd,
             ignore: ignoreProjects
         });

package/commonjs/src/models/project.model.js

@@ -12,7 +12,7 @@ const _nodefs = require("node:fs");
 const _nodepath = /*#__PURE__*/ _interop_require_default(require("node:path"));
 const _caching = require("@decohere/core/caching");
 const _extensibility = require("@decohere/core/extensibility");
-const _io = require("@decohere/core/io");
+const _io = require("@decohere/devkit/io");
 const _picomatch = /*#__PURE__*/ _interop_require_default(require("picomatch"));
 const _rxjs = require("rxjs");
 const _errors = require("../errors.js");
@@ -117,7 +117,7 @@ class Project extends (0, _extensibility.mixwith)(_haspackagejsonmixin.HasPackag
         return this.#projectFileChangedSubject.asObservable();
     }
     async getAllFiles() {
-        const files = await _io.io.findFiles(this.include, {
+        const files = await (0, _io.findFiles)(this.include, {
             cwd: this.#absoluteProjectDir,
             ignore: this.ignore
         });
@@ -138,37 +138,37 @@ class Project extends (0, _extensibility.mixwith)(_haspackagejsonmixin.HasPackag
         if (!this.#hasLoadedSourceFiles) {
             await this.getAllFiles();
         }
-        const watcher = _io.io.watch(this.#absoluteProjectDir, {
+        const watcher = (0, _io.watch)(this.#absoluteProjectDir, {
             ignoreInitial: true
         });
         this.#watcher = watcher;
-        watcher.on(_io.io.WatchEvents.add, (file)=>{
+        watcher.on(_io.WatchEvents.add, (file)=>{
             const fileEx = file;
-            this.updateSourceFileCache(_io.io.WatchEvents.add, fileEx);
+            this.updateSourceFileCache(_io.WatchEvents.add, fileEx);
             this.#projectFileChangedSubject.next({
                 project: this,
                 configuration,
-                eventName: _io.io.WatchEvents.add,
+                eventName: _io.WatchEvents.add,
                 file: fileEx
             });
         });
-        watcher.on(_io.io.WatchEvents.change, (file)=>{
+        watcher.on(_io.WatchEvents.change, (file)=>{
             const fileEx = file;
-            this.updateSourceFileCache(_io.io.WatchEvents.change, fileEx);
+            this.updateSourceFileCache(_io.WatchEvents.change, fileEx);
             this.#projectFileChangedSubject.next({
                 project: this,
                 configuration,
-                eventName: _io.io.WatchEvents.change,
+                eventName: _io.WatchEvents.change,
                 file: fileEx
             });
         });
-        watcher.on(_io.io.WatchEvents.unlink, (file)=>{
+        watcher.on(_io.WatchEvents.unlink, (file)=>{
             const fileEx = file;
-            this.updateSourceFileCache(_io.io.WatchEvents.unlink, fileEx);
+            this.updateSourceFileCache(_io.WatchEvents.unlink, fileEx);
             this.#projectFileChangedSubject.next({
                 project: this,
                 configuration,
-                eventName: _io.io.WatchEvents.unlink,
+                eventName: _io.WatchEvents.unlink,
                 file: fileEx
             });
         });
@@ -246,11 +246,11 @@ class Project extends (0, _extensibility.mixwith)(_haspackagejsonmixin.HasPackag
             return;
         }
         switch(eventName){
-            case _io.io.WatchEvents.unlink:
+            case _io.WatchEvents.unlink:
                 this.#sourceFiles.delete(file.relativePath);
                 return;
-            case _io.io.WatchEvents.add:
-            case _io.io.WatchEvents.change:
+            case _io.WatchEvents.add:
+            case _io.WatchEvents.change:
                 if (this.matchesSourcePattern(file.relativePath)) {
                     this.#sourceFiles.set(file.relativePath, file);
                     return;

package/es6/src/factories/project.factory.js

@@ -1,5 +1,6 @@
 import path from "node:path";
 import { io } from "@decohere/core/io";
+import { findFiles } from "@decohere/devkit/io";
 import { merge } from "@decohere/core/objects";
 import { WorkspaceConfigurationError } from "../errors.js";
 import { PackageJson } from "../models/package-json.model.js";
@@ -8,7 +9,7 @@ export class ProjectFactory {
     static async getProjectSeeds(config) {
         const { includeProjects, ignoreProjects, rootDir } = config;
         const cwd = rootDir ?? "./";
-        const discoveredPackageJsonFiles = await io.findFiles(includeProjects, {
+        const discoveredPackageJsonFiles = await findFiles(includeProjects, {
             cwd,
             ignore: ignoreProjects
         });

package/es6/src/models/project.model.js

@@ -11,7 +11,7 @@ import { existsSync } from "node:fs";
 import path from "node:path";
 import { cache, memoize } from "@decohere/core/caching";
 import { mixwith } from "@decohere/core/extensibility";
-import { io } from "@decohere/core/io";
+import { findFiles, WatchEvents, watch as watchDirectory } from "@decohere/devkit/io";
 import picomatch from "picomatch";
 import { Subject } from "rxjs";
 import { WorkspaceConfigurationError } from "../errors.js";
@@ -102,7 +102,7 @@ export class Project extends mixwith(HasPackageJson, HasTsConfig) {
         return this.#projectFileChangedSubject.asObservable();
     }
     async getAllFiles() {
-        const files = await io.findFiles(this.include, {
+        const files = await findFiles(this.include, {
             cwd: this.#absoluteProjectDir,
             ignore: this.ignore
         });
@@ -123,37 +123,37 @@ export class Project extends mixwith(HasPackageJson, HasTsConfig) {
         if (!this.#hasLoadedSourceFiles) {
             await this.getAllFiles();
         }
-        const watcher = io.watch(this.#absoluteProjectDir, {
+        const watcher = watchDirectory(this.#absoluteProjectDir, {
             ignoreInitial: true
         });
         this.#watcher = watcher;
-        watcher.on(io.WatchEvents.add, (file)=>{
+        watcher.on(WatchEvents.add, (file)=>{
             const fileEx = file;
-            this.updateSourceFileCache(io.WatchEvents.add, fileEx);
+            this.updateSourceFileCache(WatchEvents.add, fileEx);
             this.#projectFileChangedSubject.next({
                 project: this,
                 configuration,
-                eventName: io.WatchEvents.add,
+                eventName: WatchEvents.add,
                 file: fileEx
             });
         });
-        watcher.on(io.WatchEvents.change, (file)=>{
+        watcher.on(WatchEvents.change, (file)=>{
             const fileEx = file;
-            this.updateSourceFileCache(io.WatchEvents.change, fileEx);
+            this.updateSourceFileCache(WatchEvents.change, fileEx);
             this.#projectFileChangedSubject.next({
                 project: this,
                 configuration,
-                eventName: io.WatchEvents.change,
+                eventName: WatchEvents.change,
                 file: fileEx
             });
         });
-        watcher.on(io.WatchEvents.unlink, (file)=>{
+        watcher.on(WatchEvents.unlink, (file)=>{
             const fileEx = file;
-            this.updateSourceFileCache(io.WatchEvents.unlink, fileEx);
+            this.updateSourceFileCache(WatchEvents.unlink, fileEx);
             this.#projectFileChangedSubject.next({
                 project: this,
                 configuration,
-                eventName: io.WatchEvents.unlink,
+                eventName: WatchEvents.unlink,
                 file: fileEx
             });
         });
@@ -231,11 +231,11 @@ export class Project extends mixwith(HasPackageJson, HasTsConfig) {
             return;
         }
         switch(eventName){
-            case io.WatchEvents.unlink:
+            case WatchEvents.unlink:
                 this.#sourceFiles.delete(file.relativePath);
                 return;
-            case io.WatchEvents.add:
-            case io.WatchEvents.change:
+            case WatchEvents.add:
+            case WatchEvents.change:
                 if (this.matchesSourcePattern(file.relativePath)) {
                     this.#sourceFiles.set(file.relativePath, file);
                     return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decohere/workspace",
-  "version": "0.0.1-dev.118",
+  "version": "0.0.1-dev.120",
   "description": "Workspace and project model primitives for monorepo tooling",
   "keywords": [
     "typescript",
@@ -24,8 +24,9 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@decohere/core": "0.0.1-dev.118",
-    "@decohere/crucible": "0.0.1-dev.118",
+    "@decohere/core": "0.0.1-dev.120",
+    "@decohere/crucible": "0.0.1-dev.120",
+    "@decohere/devkit": "0.0.1-dev.120",
     "picomatch": "^4.0.4",
     "rxjs": "^7.8.2",
     "typescript": "^6.0.3"

package/types/src/models/project-file-event.d.ts

@@ -1,7 +1,8 @@
-import type { FileEx, io } from "@decohere/core/io";
+import type { FileEx } from "@decohere/core/io";
+import type { WatchEventName } from "@decohere/devkit/io";
 import type { Project } from "./project.model.js";
 export type ProjectFileEvent = {
-    eventName: io.WatchEventName;
+    eventName: WatchEventName;
     project: Project;
     configuration: string;
     file: FileEx;

package/types/src/models/project.model.d.ts

@@ -1,4 +1,4 @@
-import { type FileEx, type Watcher } from "@decohere/core/io";
+import type { FileEx, Watcher } from "@decohere/core/io";
 import { HasPackageJson } from "./has-package-json.mixin.js";
 import { HasTsConfig } from "./has-tsconfig.mixin.js";
 import { PackageJson } from "./package-json.model.js";