@effect-app/infra 2.8.2 → 2.9.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +13 -0
- package/_cjs/CUPS.cjs +2 -3
- package/_cjs/CUPS.cjs.map +1 -1
- package/dist/CUPS.d.ts +4 -5
- package/dist/CUPS.d.ts.map +1 -1
- package/dist/CUPS.js +4 -5
- package/dist/Model/query/new-kid-interpreter.d.ts +1 -1
- package/dist/RequestContext.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/CUPS.ts +4 -5
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,18 @@
|
|
|
1
1
|
# @effect-app/infra
|
|
2
2
|
|
|
3
|
+
## 2.9.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- 9ef18f6: adapt Prelude workaround
|
|
8
|
+
|
|
9
|
+
### Patch Changes
|
|
10
|
+
|
|
11
|
+
- 9ef18f6: adapt Prelude workaround
|
|
12
|
+
- Updated dependencies [9ef18f6]
|
|
13
|
+
- Updated dependencies [9ef18f6]
|
|
14
|
+
- effect-app@2.3.0
|
|
15
|
+
|
|
3
16
|
## 2.8.2
|
|
4
17
|
|
|
5
18
|
### Patch Changes
|
package/_cjs/CUPS.cjs
CHANGED
|
@@ -7,7 +7,6 @@ exports.prepareTempDir = exports.makePrintJobTempFileArrayBuffer = exports.makeP
|
|
|
7
7
|
var _fileUtil = require("@effect-app/infra/fileUtil");
|
|
8
8
|
var _child_process = _interopRequireDefault(require("child_process"));
|
|
9
9
|
var _effectApp = require("effect-app");
|
|
10
|
-
var _Schema = require("effect-app/Schema");
|
|
11
10
|
var _utils = require("effect-app/utils");
|
|
12
11
|
var _fs = _interopRequireDefault(require("fs"));
|
|
13
12
|
var _os = _interopRequireDefault(require("os"));
|
|
@@ -15,7 +14,7 @@ var _path = _interopRequireDefault(require("path"));
|
|
|
15
14
|
var _util = _interopRequireDefault(require("util"));
|
|
16
15
|
var _logger = require("./logger.cjs");
|
|
17
16
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
18
|
-
const PrinterId = exports.PrinterId =
|
|
17
|
+
const PrinterId = exports.PrinterId = _effectApp.S.NonEmptyString255;
|
|
19
18
|
const exec_ = _util.default.promisify(_child_process.default.exec);
|
|
20
19
|
const exec = command => _effectApp.Effect.andThen(_logger.InfraLogger.logDebug(`Executing: ${command}`), _effectApp.Effect.tap(_effectApp.Effect.tryPromise(() => exec_(command)), r => _logger.InfraLogger.logDebug(`Executed`).pipe(_effectApp.Effect.annotateLogs("result", (0, _utils.pretty)(r)))));
|
|
21
20
|
function printFile(printer, options) {
|
|
@@ -64,7 +63,7 @@ function getAvailablePrinters(host) {
|
|
|
64
63
|
} = yield* exec(["lpstat", ...buildListArgs({
|
|
65
64
|
host
|
|
66
65
|
}), "-s"].join(" "));
|
|
67
|
-
return [...stdout.matchAll(/device for (\w+):/g)].map(_ => _[1]).filter(_effectApp.Predicate.isNotNullable).map(_ =>
|
|
66
|
+
return [...stdout.matchAll(/device for (\w+):/g)].map(_ => _[1]).filter(_effectApp.Predicate.isNotNullable).map(_ => _effectApp.S.NonEmptyString255(_));
|
|
68
67
|
});
|
|
69
68
|
}
|
|
70
69
|
function* buildListArgs(config) {
|
package/_cjs/CUPS.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CUPS.cjs","names":["_fileUtil","require","_child_process","_interopRequireDefault","_effectApp","
|
|
1
|
+
{"version":3,"file":"CUPS.cjs","names":["_fileUtil","require","_child_process","_interopRequireDefault","_effectApp","_utils","_fs","_os","_path","_util","_logger","e","__esModule","default","PrinterId","exports","S","NonEmptyString255","exec_","util","promisify","cp","exec","command","Effect","andThen","InfraLogger","logDebug","tap","tryPromise","r","pipe","annotateLogs","pretty","printFile","printer","options","filePath","printFile_","buildPrintArgs","join","url","host","username","id","o","prepareTempDir","sync","fs","mkdirSync","path","os","tmpdir","err","includes","makeTempFile","tempFile","makePrintJobTempFile","makePrintJobTempFileArrayBuffer","buffer","Buffer","from","printBuffer","flatMap","scoped","getAvailablePrinters","gen","stdout","buildListArgs","matchAll","map","_","filter","Predicate","isNotNullable","config","CUPSConfig","Config","all","server","string","s","URL","option","nested","CUPS","Service","effect","print","printerId","_print","value","Fake","Layer","make","logInfo","zipRight","stderr","byteLength","toString"],"sources":["../src/CUPS.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/dist/CUPS.d.ts
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import type { FileOptions } from "@effect-app/infra/fileUtil";
|
|
2
|
-
import { Config, Effect, Layer } from "effect-app";
|
|
3
|
-
|
|
4
|
-
export
|
|
5
|
-
export type PrinterId = NonEmptyString255;
|
|
2
|
+
import { Config, Effect, Layer, S } from "effect-app";
|
|
3
|
+
export declare const PrinterId: S.WithDefaults<S.Schema<string & S.NonEmptyString255Brand, string, never>> & S.Schema<string & S.NonEmptyString255Brand, string, never>;
|
|
4
|
+
export type PrinterId = S.NonEmptyString255;
|
|
6
5
|
export declare const prepareTempDir: Effect.Effect<void, never, never>;
|
|
7
6
|
export declare const makePrintJobTempFile: (data: string | import("stream").Stream | NodeJS.ArrayBufferView | Iterable<string | NodeJS.ArrayBufferView> | AsyncIterable<string | NodeJS.ArrayBufferView>, options?: FileOptions) => Effect.Effect<string, import("effect/Cause").UnknownException, import("effect/Scope").Scope>;
|
|
8
7
|
export declare const makePrintJobTempFileArrayBuffer: (buffer: ArrayBuffer, options?: FileOptions) => Effect.Effect<string, import("effect/Cause").UnknownException, import("effect/Scope").Scope>;
|
|
@@ -19,7 +18,7 @@ declare const CUPS_base: Effect.Service.Class<CUPS, "effect-app/CUPS", {
|
|
|
19
18
|
stdout: string;
|
|
20
19
|
stderr: string;
|
|
21
20
|
}, import("effect/Cause").UnknownException, never>;
|
|
22
|
-
getAvailablePrinters: Effect.Effect<(string &
|
|
21
|
+
getAvailablePrinters: Effect.Effect<(string & S.NonEmptyString255Brand)[], import("effect/Cause").UnknownException, never>;
|
|
23
22
|
}, import("effect/ConfigError").ConfigError, never>;
|
|
24
23
|
}>;
|
|
25
24
|
export declare class CUPS extends CUPS_base {
|
package/dist/CUPS.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CUPS.d.ts","sourceRoot":"","sources":["../src/CUPS.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAG7D,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAa,
|
|
1
|
+
{"version":3,"file":"CUPS.d.ts","sourceRoot":"","sources":["../src/CUPS.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAG7D,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAa,CAAC,EAAE,MAAM,YAAY,CAAA;AAQhE,eAAO,MAAM,SAAS,yIAAsB,CAAA;AAC5C,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,iBAAiB,CAAA;AAuC3C,eAAO,MAAM,cAAc,mCAUzB,CAAA;AAGF,eAAO,MAAM,oBAAoB,uRAA4B,CAAA;AAC7D,eAAO,MAAM,+BAA+B,WAAY,WAAW,YAAY,WAAW,iGACtC,CAAA;AA2BpD,eAAO,MAAM,UAAU;;EAQrB,CAAA;;;wBAKyB,WAAW,aAAa,SAAS,cAAc,MAAM,EAAE;;;;8BAStD,MAAM,aAAa,SAAS,cAAc,MAAM,EAAE;;;;;;;AAZ9E,qBAAa,IAAK,SAAQ,SAoBxB;IACA,MAAM,CAAC,QAAQ,CAAC,IAAI,kCA+BnB;CACF"}
|
package/dist/CUPS.js
CHANGED
|
@@ -1,14 +1,13 @@
|
|
|
1
1
|
import { tempFile } from "@effect-app/infra/fileUtil";
|
|
2
2
|
import cp from "child_process";
|
|
3
|
-
import { Config, Effect, Layer, Predicate } from "effect-app";
|
|
4
|
-
import { NonEmptyString255 } from "effect-app/Schema";
|
|
3
|
+
import { Config, Effect, Layer, Predicate, S } from "effect-app";
|
|
5
4
|
import { pretty } from "effect-app/utils";
|
|
6
5
|
import fs from "fs";
|
|
7
6
|
import os from "os";
|
|
8
7
|
import path from "path";
|
|
9
8
|
import util from "util";
|
|
10
9
|
import { InfraLogger } from "./logger.js";
|
|
11
|
-
export const PrinterId = NonEmptyString255;
|
|
10
|
+
export const PrinterId = S.NonEmptyString255;
|
|
12
11
|
const exec_ = util.promisify(cp.exec);
|
|
13
12
|
const exec = (command) => Effect.andThen(InfraLogger.logDebug(`Executing: ${command}`), Effect.tap(Effect
|
|
14
13
|
.tryPromise(() => exec_(command)), (r) => (InfraLogger.logDebug(`Executed`).pipe(Effect.annotateLogs("result", pretty(r))))));
|
|
@@ -58,7 +57,7 @@ function getAvailablePrinters(host) {
|
|
|
58
57
|
return [...stdout.matchAll(/device for (\w+):/g)]
|
|
59
58
|
.map((_) => _[1])
|
|
60
59
|
.filter(Predicate.isNotNullable)
|
|
61
|
-
.map((_) => NonEmptyString255(_));
|
|
60
|
+
.map((_) => S.NonEmptyString255(_));
|
|
62
61
|
});
|
|
63
62
|
}
|
|
64
63
|
function* buildListArgs(config) {
|
|
@@ -113,4 +112,4 @@ export class CUPS extends Effect.Service()("effect-app/CUPS", {
|
|
|
113
112
|
});
|
|
114
113
|
}));
|
|
115
114
|
}
|
|
116
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
115
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ1VQUy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9DVVBTLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQTtBQUNyRCxPQUFPLEVBQUUsTUFBTSxlQUFlLENBQUE7QUFDOUIsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLFNBQVMsRUFBRSxDQUFDLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDaEUsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFBO0FBQ3pDLE9BQU8sRUFBRSxNQUFNLElBQUksQ0FBQTtBQUNuQixPQUFPLEVBQUUsTUFBTSxJQUFJLENBQUE7QUFDbkIsT0FBTyxJQUFJLE1BQU0sTUFBTSxDQUFBO0FBQ3ZCLE9BQU8sSUFBSSxNQUFNLE1BQU0sQ0FBQTtBQUN2QixPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sYUFBYSxDQUFBO0FBRXpDLE1BQU0sQ0FBQyxNQUFNLFNBQVMsR0FBRyxDQUFDLENBQUMsaUJBQWlCLENBQUE7QUFHNUMsTUFBTSxLQUFLLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUE7QUFDckMsTUFBTSxJQUFJLEdBQUcsQ0FBQyxPQUFlLEVBQUUsRUFBRSxDQUMvQixNQUFNLENBQUMsT0FBTyxDQUNaLFdBQVcsQ0FBQyxRQUFRLENBQUMsY0FBYyxPQUFPLEVBQUUsQ0FBQyxFQUM3QyxNQUFNLENBQUMsR0FBRyxDQUNSLE1BQU07S0FDSCxVQUFVLENBQUMsR0FBRyxFQUFFLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDLEVBQ25DLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxRQUFRLENBQUMsVUFBVSxDQUFDLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxZQUFZLENBQUMsUUFBUSxFQUFFLE1BQU0sQ0FBQyxDQUFDLENB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
|
|
@@ -15,7 +15,7 @@ export declare const toFilter: <TFieldValues extends FieldValues, A, R, TFieldVa
|
|
|
15
15
|
key: import("../filter/types/path/eager.js").Path<TFieldValues>;
|
|
16
16
|
direction: "ASC" | "DESC";
|
|
17
17
|
}[]];
|
|
18
|
-
ttype: "one" | "
|
|
18
|
+
ttype: "one" | "many" | "count";
|
|
19
19
|
mode: "project" | "collect" | "transform";
|
|
20
20
|
filter: FilterResult[];
|
|
21
21
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RequestContext.d.ts","sourceRoot":"","sources":["../src/RequestContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,MAAM,YAAY,CAAA;AAIxC,eAAO,MAAM,MAAM,yBAAwB,CAAA;AAC3C,MAAM,MAAM,MAAM,GAAG,OAAO,MAAM,CAAC,IAAI,CAAA;AAEvC,eAAO,MAAM,SAAS,gCAAoC,CAAA;;;;;;;;;;;;;IAmBxD,kBAAkB;;;;
|
|
1
|
+
{"version":3,"file":"RequestContext.d.ts","sourceRoot":"","sources":["../src/RequestContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,MAAM,YAAY,CAAA;AAIxC,eAAO,MAAM,MAAM,yBAAwB,CAAA;AAC3C,MAAM,MAAM,MAAM,GAAG,OAAO,MAAM,CAAC,IAAI,CAAA;AAEvC,eAAO,MAAM,SAAS,gCAAoC,CAAA;;;;;;;;;;;;;IAmBxD,kBAAkB;;;;yBAkBA,EAAG,iBAElB;;;yBAe6B,EAAG,iBAAiB;;;;;;;;;;;;;;;;;AApDtD;;;GAGG;AACH,qBAAa,cAAe,SAAQ,mBAelC;IAGA,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc;;;;CAMrD;AAED,eAAO,MAAM,cAAc,QAAS,IAAI,CAAC,cAAc,EAAE,QAAQ,GAAG,WAAW,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;;;;;;;CAgBxG,CAAA;AAKF,yBAAiB,cAAc,CAAC;IAC9B,UAAiB,IAAK,SAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,cAAc,CAAC,QAAQ,CAAC,CAAC;KAAG;CACnF"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect-app/infra",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.9.0",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"dependencies": {
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
"proper-lockfile": "^4.1.2",
|
|
15
15
|
"pure-rand": "6.1.0",
|
|
16
16
|
"query-string": "^9.1.1",
|
|
17
|
-
"effect-app": "2.
|
|
17
|
+
"effect-app": "2.3.0"
|
|
18
18
|
},
|
|
19
19
|
"devDependencies": {
|
|
20
20
|
"@azure/cosmos": "^4.1.1",
|
package/src/CUPS.ts
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import type { FileOptions } from "@effect-app/infra/fileUtil"
|
|
2
2
|
import { tempFile } from "@effect-app/infra/fileUtil"
|
|
3
3
|
import cp from "child_process"
|
|
4
|
-
import { Config, Effect, Layer, Predicate } from "effect-app"
|
|
5
|
-
import { NonEmptyString255 } from "effect-app/Schema"
|
|
4
|
+
import { Config, Effect, Layer, Predicate, S } from "effect-app"
|
|
6
5
|
import { pretty } from "effect-app/utils"
|
|
7
6
|
import fs from "fs"
|
|
8
7
|
import os from "os"
|
|
@@ -10,8 +9,8 @@ import path from "path"
|
|
|
10
9
|
import util from "util"
|
|
11
10
|
import { InfraLogger } from "./logger.js"
|
|
12
11
|
|
|
13
|
-
export const PrinterId = NonEmptyString255
|
|
14
|
-
export type PrinterId = NonEmptyString255
|
|
12
|
+
export const PrinterId = S.NonEmptyString255
|
|
13
|
+
export type PrinterId = S.NonEmptyString255
|
|
15
14
|
|
|
16
15
|
const exec_ = util.promisify(cp.exec)
|
|
17
16
|
const exec = (command: string) =>
|
|
@@ -82,7 +81,7 @@ function getAvailablePrinters(host?: string) {
|
|
|
82
81
|
return [...stdout.matchAll(/device for (\w+):/g)]
|
|
83
82
|
.map((_) => _[1])
|
|
84
83
|
.filter(Predicate.isNotNullable)
|
|
85
|
-
.map((_) => NonEmptyString255(_))
|
|
84
|
+
.map((_) => S.NonEmptyString255(_))
|
|
86
85
|
})
|
|
87
86
|
}
|
|
88
87
|
|