aboutsummaryrefslogtreecommitdiff
path: root/src/client/util
diff options
context:
space:
mode:
Diffstat (limited to 'src/client/util')
-rw-r--r--src/client/util/DictationManager.ts346
-rw-r--r--src/client/util/Import & Export/DirectoryImportBox.tsx3
-rw-r--r--src/client/util/Scripting.ts15
-rw-r--r--src/client/util/SerializationHelper.ts2
4 files changed, 183 insertions, 183 deletions
diff --git a/src/client/util/DictationManager.ts b/src/client/util/DictationManager.ts
index a086ac45e..a6dcda4bc 100644
--- a/src/client/util/DictationManager.ts
+++ b/src/client/util/DictationManager.ts
@@ -105,16 +105,16 @@ export namespace DictationManager {
try {
results = await (pendingListen = listenImpl(options));
pendingListen = undefined;
- if (results) {
- Utils.CopyText(results);
- if (overlay) {
- DictationOverlay.Instance.isListening = false;
- const execute = options?.tryExecute;
- DictationOverlay.Instance.dictatedPhrase = execute ? results.toLowerCase() : results;
- DictationOverlay.Instance.dictationSuccess = execute ? await DictationManager.Commands.execute(results) : true;
- }
- options?.tryExecute && await DictationManager.Commands.execute(results);
- }
+ // if (results) {
+ // Utils.CopyText(results);
+ // if (overlay) {
+ // DictationOverlay.Instance.isListening = false;
+ // const execute = options?.tryExecute;
+ // DictationOverlay.Instance.dictatedPhrase = execute ? results.toLowerCase() : results;
+ // DictationOverlay.Instance.dictationSuccess = execute ? await DictationManager.Commands.execute(results) : true;
+ // }
+ // options?.tryExecute && await DictationManager.Commands.execute(results);
+ // }
} catch (e: any) {
console.log(e);
if (overlay) {
@@ -225,168 +225,168 @@ export namespace DictationManager {
}
- export namespace Commands {
-
- export const dictationFadeDuration = 2000;
-
- export type IndependentAction = (target: DocumentView) => any | Promise<any>;
- export type IndependentEntry = { action: IndependentAction, restrictTo?: DocumentType[] };
-
- export type DependentAction = (target: DocumentView, matches: RegExpExecArray) => any | Promise<any>;
- export type DependentEntry = { expression: RegExp, action: DependentAction, restrictTo?: DocumentType[] };
-
- export const RegisterIndependent = (key: string, value: IndependentEntry) => Independent.set(key, value);
- export const RegisterDependent = (entry: DependentEntry) => Dependent.push(entry);
-
- export const execute = async (phrase: string) => {
- return UndoManager.RunInBatch(async () => {
- const targets = SelectionManager.Views();
- if (!targets || !targets.length) {
- return;
- }
-
- phrase = phrase.toLowerCase();
- const entry = Independent.get(phrase);
-
- if (entry) {
- let success = false;
- const restrictTo = entry.restrictTo;
- for (const target of targets) {
- if (!restrictTo || validate(target, restrictTo)) {
- await entry.action(target);
- success = true;
- }
- }
- return success;
- }
-
- for (const entry of Dependent) {
- const regex = entry.expression;
- const matches = regex.exec(phrase);
- regex.lastIndex = 0;
- if (matches !== null) {
- let success = false;
- const restrictTo = entry.restrictTo;
- for (const target of targets) {
- if (!restrictTo || validate(target, restrictTo)) {
- await entry.action(target, matches);
- success = true;
- }
- }
- return success;
- }
- }
-
- return false;
- }, "Execute Command");
- };
-
- const ConstructorMap = new Map<DocumentType, CastCtor>([
- [DocumentType.COL, listSpec(Doc)],
- [DocumentType.AUDIO, AudioField],
- [DocumentType.IMG, ImageField],
- [DocumentType.IMPORT, listSpec(Doc)],
- [DocumentType.RTF, "string"]
- ]);
-
- const tryCast = (view: DocumentView, type: DocumentType) => {
- const ctor = ConstructorMap.get(type);
- if (!ctor) {
- return false;
- }
- return Cast(Doc.GetProto(view.props.Document).data, ctor) !== undefined;
- };
-
- const validate = (target: DocumentView, types: DocumentType[]) => {
- for (const type of types) {
- if (tryCast(target, type)) {
- return true;
- }
- }
- return false;
- };
-
- const interpretNumber = (number: string) => {
- const initial = parseInt(number);
- if (!isNaN(initial)) {
- return initial;
- }
- const converted = interpreter.wordsToNumbers(number, { fuzzy: true });
- if (converted === null) {
- return NaN;
- }
- return typeof converted === "string" ? parseInt(converted) : converted;
- };
-
- const Independent = new Map<string, IndependentEntry>([
-
- ["clear", {
- action: (target: DocumentView) => Doc.GetProto(target.props.Document).data = new List(),
- restrictTo: [DocumentType.COL]
- }],
-
- ["open fields", {
- action: (target: DocumentView) => {
- const kvp = Docs.Create.KVPDocument(target.props.Document, { _width: 300, _height: 300 });
- target.props.addDocTab(kvp, "add:right");
- }
- }],
-
- ["new outline", {
- action: (target: DocumentView) => {
- const newBox = Docs.Create.TextDocument("", { _width: 400, _height: 200, title: "My Outline", _autoHeight: true });
- const proto = newBox.proto!;
- const prompt = "Press alt + r to start dictating here...";
- const head = 3;
- const anchor = head + prompt.length;
- const proseMirrorState = `{"doc":{"type":"doc","content":[{"type":"ordered_list","content":[{"type":"list_item","content":[{"type":"paragraph","content":[{"type":"text","text":"${prompt}"}]}]}]}]},"selection":{"type":"text","anchor":${anchor},"head":${head}}}`;
- proto.data = new RichTextField(proseMirrorState);
- proto.backgroundColor = "#eeffff";
- target.props.addDocTab(newBox, "add:right");
- }
- }]
-
- ]);
-
- const Dependent = new Array<DependentEntry>(
-
- {
- expression: /create (\w+) documents of type (image|nested collection)/g,
- action: (target: DocumentView, matches: RegExpExecArray) => {
- const count = interpretNumber(matches[1]);
- const what = matches[2];
- const dataDoc = Doc.GetProto(target.props.Document);
- const fieldKey = "data";
- if (isNaN(count)) {
- return;
- }
- for (let i = 0; i < count; i++) {
- let created: Doc | undefined;
- switch (what) {
- case "image":
- created = Docs.Create.ImageDocument("https://upload.wikimedia.org/wikipedia/commons/thumb/3/3a/Cat03.jpg/1200px-Cat03.jpg");
- break;
- case "nested collection":
- created = Docs.Create.FreeformDocument([], {});
- break;
- }
- created && Doc.AddDocToList(dataDoc, fieldKey, created);
- }
- },
- restrictTo: [DocumentType.COL]
- },
-
- {
- expression: /view as (freeform|stacking|masonry|schema|tree)/g,
- action: (target: DocumentView, matches: RegExpExecArray) => {
- const mode = matches[1];
- mode && (target.props.Document._viewType = mode);
- },
- restrictTo: [DocumentType.COL]
- }
-
- );
-
- }
+ // export namespace Commands {
+
+ // export const dictationFadeDuration = 2000;
+
+ // export type IndependentAction = (target: DocumentView) => any | Promise<any>;
+ // export type IndependentEntry = { action: IndependentAction, restrictTo?: DocumentType[] };
+
+ // export type DependentAction = (target: DocumentView, matches: RegExpExecArray) => any | Promise<any>;
+ // export type DependentEntry = { expression: RegExp, action: DependentAction, restrictTo?: DocumentType[] };
+
+ // export const RegisterIndependent = (key: string, value: IndependentEntry) => Independent.set(key, value);
+ // export const RegisterDependent = (entry: DependentEntry) => Dependent.push(entry);
+
+ // export const execute = async (phrase: string) => {
+ // return UndoManager.RunInBatch(async () => {
+ // const targets = SelectionManager.Views();
+ // if (!targets || !targets.length) {
+ // return;
+ // }
+
+ // phrase = phrase.toLowerCase();
+ // const entry = Independent.get(phrase);
+
+ // if (entry) {
+ // let success = false;
+ // const restrictTo = entry.restrictTo;
+ // for (const target of targets) {
+ // if (!restrictTo || validate(target, restrictTo)) {
+ // await entry.action(target);
+ // success = true;
+ // }
+ // }
+ // return success;
+ // }
+
+ // for (const entry of Dependent) {
+ // const regex = entry.expression;
+ // const matches = regex.exec(phrase);
+ // regex.lastIndex = 0;
+ // if (matches !== null) {
+ // let success = false;
+ // const restrictTo = entry.restrictTo;
+ // for (const target of targets) {
+ // if (!restrictTo || validate(target, restrictTo)) {
+ // await entry.action(target, matches);
+ // success = true;
+ // }
+ // }
+ // return success;
+ // }
+ // }
+
+ // return false;
+ // }, "Execute Command");
+ // };
+
+ // const ConstructorMap = new Map<DocumentType, CastCtor>([
+ // [DocumentType.COL, listSpec(Doc)],
+ // [DocumentType.AUDIO, AudioField],
+ // [DocumentType.IMG, ImageField],
+ // [DocumentType.IMPORT, listSpec(Doc)],
+ // [DocumentType.RTF, "string"]
+ // ]);
+
+ // const tryCast = (view: DocumentView, type: DocumentType) => {
+ // const ctor = ConstructorMap.get(type);
+ // if (!ctor) {
+ // return false;
+ // }
+ // return Cast(Doc.GetProto(view.props.Document).data, ctor) !== undefined;
+ // };
+
+ // const validate = (target: DocumentView, types: DocumentType[]) => {
+ // for (const type of types) {
+ // if (tryCast(target, type)) {
+ // return true;
+ // }
+ // }
+ // return false;
+ // };
+
+ // const interpretNumber = (number: string) => {
+ // const initial = parseInt(number);
+ // if (!isNaN(initial)) {
+ // return initial;
+ // }
+ // const converted = interpreter.wordsToNumbers(number, { fuzzy: true });
+ // if (converted === null) {
+ // return NaN;
+ // }
+ // return typeof converted === "string" ? parseInt(converted) : converted;
+ // };
+
+ // const Independent = new Map<string, IndependentEntry>([
+
+ // ["clear", {
+ // action: (target: DocumentView) => Doc.GetProto(target.props.Document).data = new List(),
+ // restrictTo: [DocumentType.COL]
+ // }],
+
+ // ["open fields", {
+ // action: (target: DocumentView) => {
+ // const kvp = Docs.Create.KVPDocument(target.props.Document, { _width: 300, _height: 300 });
+ // target.props.addDocTab(kvp, "add:right");
+ // }
+ // }],
+
+ // ["new outline", {
+ // action: (target: DocumentView) => {
+ // const newBox = Docs.Create.TextDocument("", { _width: 400, _height: 200, title: "My Outline", _autoHeight: true });
+ // const proto = newBox.proto!;
+ // const prompt = "Press alt + r to start dictating here...";
+ // const head = 3;
+ // const anchor = head + prompt.length;
+ // const proseMirrorState = `{"doc":{"type":"doc","content":[{"type":"ordered_list","content":[{"type":"list_item","content":[{"type":"paragraph","content":[{"type":"text","text":"${prompt}"}]}]}]}]},"selection":{"type":"text","anchor":${anchor},"head":${head}}}`;
+ // proto.data = new RichTextField(proseMirrorState);
+ // proto.backgroundColor = "#eeffff";
+ // target.props.addDocTab(newBox, "add:right");
+ // }
+ // }]
+
+ // ]);
+
+ // const Dependent = new Array<DependentEntry>(
+
+ // {
+ // expression: /create (\w+) documents of type (image|nested collection)/g,
+ // action: (target: DocumentView, matches: RegExpExecArray) => {
+ // const count = interpretNumber(matches[1]);
+ // const what = matches[2];
+ // const dataDoc = Doc.GetProto(target.props.Document);
+ // const fieldKey = "data";
+ // if (isNaN(count)) {
+ // return;
+ // }
+ // for (let i = 0; i < count; i++) {
+ // let created: Doc | undefined;
+ // switch (what) {
+ // case "image":
+ // created = Docs.Create.ImageDocument("https://upload.wikimedia.org/wikipedia/commons/thumb/3/3a/Cat03.jpg/1200px-Cat03.jpg");
+ // break;
+ // case "nested collection":
+ // created = Docs.Create.FreeformDocument([], {});
+ // break;
+ // }
+ // created && Doc.AddDocToList(dataDoc, fieldKey, created);
+ // }
+ // },
+ // restrictTo: [DocumentType.COL]
+ // },
+
+ // {
+ // expression: /view as (freeform|stacking|masonry|schema|tree)/g,
+ // action: (target: DocumentView, matches: RegExpExecArray) => {
+ // const mode = matches[1];
+ // mode && (target.props.Document._viewType = mode);
+ // },
+ // restrictTo: [DocumentType.COL]
+ // }
+
+ // );
+
+ // }
} \ No newline at end of file
diff --git a/src/client/util/Import & Export/DirectoryImportBox.tsx b/src/client/util/Import & Export/DirectoryImportBox.tsx
index 9eee75253..39e9251a5 100644
--- a/src/client/util/Import & Export/DirectoryImportBox.tsx
+++ b/src/client/util/Import & Export/DirectoryImportBox.tsx
@@ -2,6 +2,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import { BatchedArray } from "array-batcher";
import { action, computed, IReactionDisposer, observable, reaction, runInAction } from "mobx";
import { observer } from "mobx-react";
+import { extname } from "path";
import Measure, { ContentRect } from "react-measure";
import { Doc, DocListCast, DocListCastAsync, Opt } from "../../../fields/Doc";
import { Id } from "../../../fields/FieldSymbols";
@@ -84,7 +85,7 @@ export class DirectoryImportBox extends React.Component<FieldViewProps> {
for (let i = 0; i < files.length; i++) {
const file = files.item(i);
if (file && !unsupported.includes(file.type)) {
- const ext = file.name.replace(/.*\./, "").toLowerCase(); // path.extname(file.name).toLowerCase();
+ const ext = extname(file.name).toLowerCase();
if (AcceptableMedia.imageFormats.includes(ext)) {
validated.push(file);
}
diff --git a/src/client/util/Scripting.ts b/src/client/util/Scripting.ts
index 40b94024e..ffe60c72e 100644
--- a/src/client/util/Scripting.ts
+++ b/src/client/util/Scripting.ts
@@ -10,7 +10,6 @@ export { ts };
// @ts-ignore
import * as typescriptlib from '!!raw-loader!./type_decls.d';
-import { Doc, Field } from '../../fields/Doc';
export interface ScriptSuccess {
success: true;
@@ -169,19 +168,19 @@ function Run(script: string | undefined, customParams: string[], diagnostics: an
let batch: { end(): void } | undefined = undefined;
try {
if (!options.editable) {
- batch = Doc.MakeReadOnly();
+ // batch = Doc.MakeReadOnly();
}
const result = compiledFunction.apply(thisParam, params).apply(thisParam, argsArray);
if (batch) {
- batch.end();
+ //batch.end();
}
return { success: true, result };
} catch (error) {
if (batch) {
- batch.end();
+ //batch.end();
}
onError?.(script + " " + error);
return { success: false, error, result: errorVal };
@@ -247,13 +246,13 @@ export type Traverser = (node: ts.Node, indentation: string) => boolean | void;
export type TraverserParam = Traverser | { onEnter: Traverser, onLeave: Traverser };
export type Transformer = {
transformer: ts.TransformerFactory<ts.SourceFile>,
- getVars?: () => { capturedVariables: { [name: string]: Field } }
+ getVars?: () => { capturedVariables: { [name: string]: any /* Field*/ } }
};
export interface ScriptOptions {
requiredType?: string; // does function required a typed return value
addReturn?: boolean; // does the compiler automatically add a return statement
params?: { [name: string]: string }; // list of function parameters and their types
- capturedVariables?: { [name: string]: Field }; // list of captured variables
+ capturedVariables?: { [name: string]: any /* Field */ }; // list of captured variables
typecheck?: boolean; // should the compiler perform typechecking
editable?: boolean; // can the script edit Docs
traverser?: TraverserParam;
@@ -270,8 +269,8 @@ function forEachNode(node: ts.Node, onEnter: Traverser, onExit?: Traverser, inde
export function CompileScript(script: string, options: ScriptOptions = {}): CompileResult {
const { requiredType = "", addReturn = false, params = {}, capturedVariables = {}, typecheck = true } = options;
- if (options.params && !options.params.this) options.params.this = Doc.name;
- if (options.params && !options.params.self) options.params.self = Doc.name;
+ if (options.params && !options.params.this) options.params.this = "Doc";//Doc.name;
+ if (options.params && !options.params.self) options.params.self = "Doc";//Doc.name;
if (options.globals) {
Scripting.setScriptingGlobals(options.globals);
}
diff --git a/src/client/util/SerializationHelper.ts b/src/client/util/SerializationHelper.ts
index 2d598c1ac..fd8e38361 100644
--- a/src/client/util/SerializationHelper.ts
+++ b/src/client/util/SerializationHelper.ts
@@ -86,7 +86,7 @@ export function Deserializable(constructor: { new(...args: any[]): any } | strin
serializationTypes[name] = { ctor, afterDeserialize };
reverseMap[ctor.name] = name;
} else {
- throw new Error(`Name ${name} has already been registered as deserializable`);
+ ;//throw new Error(`Name ${name} has already been registered as deserializable`);
}
}
if (typeof constructor === "string") {
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-12-10 21:54:39 +0000