Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for Deno #209

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: test and build

on: [push, pull_request]

jobs:
build_test:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 12.x
- uses: denolib/setup-deno@v2
with:
deno-version: v1.4.6
- run: npm install
- run: npm install yarn -g
- run: npm build
- run: npm test
- run: npm run deno_build
- run: npm run deno_test
2 changes: 1 addition & 1 deletion coverage.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions deno_lib/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2020 Colin McDonnell

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
280 changes: 280 additions & 0 deletions deno_lib/PseudoPromise.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,280 @@
import { INVALID } from './helpers/util.ts';
import { ZodError } from './ZodError.ts';
// import { INVALID } from './util/index.ts';

type Func = (arg: any, ctx: { async: boolean }) => any;
type FuncItem = { type: 'function'; function: Func };
type Catcher = (error: Error, ctx: { async: boolean }) => any;
type CatcherItem = { type: 'catcher'; catcher: Catcher };
type Items = (FuncItem | CatcherItem)[];

export class PseudoPromise<ReturnType = undefined> {
readonly _return: ReturnType | undefined;
items: Items;
constructor(funcs: Items = []) {
this.items = funcs;
}

static all = <T extends PseudoPromise<any>[]>(pps: T) => {
return new PseudoPromise().all(pps);
};

all = <T extends PseudoPromise<any>[]>(
pps: T,
): PseudoPromise<
{
[k in keyof T]: T[k] extends PseudoPromise<any> ? T[k]['_return'] : never;
}
> => {
return this.then((_arg, ctx) => {
// const results = pps.map(pp => pp.getValue());
// const caughtPPs = pps.map((pp, index) =>
// pp.catch(err => {
// if (err instanceof ZodError) zerr.addIssues(err.issues);
// }),
// );
if (ctx.async) {
try {
return Promise.all(pps.map(pp => pp.getValueAsync()));
} catch (err) {}
// return Promise.all(pps.map(pp => pp.getValueAsync()));
} else {
try {
return pps.map(pp => pp.getValueSync()) as any;
} catch (err) {}
}
});
};

// subpromise = <T extends PseudoPromise<any>>(subprom:T)=>{
// return this.then((arg,ctx)=>{
// const subval = subprom.
// })
// }

// static allAsync = (pps:all PseudoPromise<any>[]) => {
// return PseudoPromise.resolve(Promise.all(pps.map(pp => pp.toPromise())));
// };

static object = (pps: { [k: string]: PseudoPromise<any> }) => {
return new PseudoPromise().then((_arg, ctx) => {
const value: any = {};
// const items = Object.keys(pps).map(k => {
// const v = pps[k].getValue();
// return [k, v] as [string, any];
// });

// let isAsync = ctx.async; //items.some(item => item[1] instanceof Promise);
// Object.keys(pps).some(
// k => pps[k].getValue() instanceof Promise,
// );
//

const zerr = new ZodError([]);
if (ctx.async) {
const getAsyncObject = async () => {
// const promises = Object.keys(pps).map(async k => {
// const v = await pps[k].getValue();
// return [k, v] as [string, any];
// });
// const items = await Promise.all(promises);
// const asyncValue: any = {};
const items = await Promise.all(
Object.keys(pps).map(async k => {
try {
const v = await pps[k].getValueAsync();
return [k, v] as [string, any];
} catch (err) {
if (err instanceof ZodError) {
zerr.addIssues(err.issues);
return [k, INVALID] as [string, any];
}
throw err;
}
}),
);

if (!zerr.isEmpty) throw zerr;
// // const resolvedItems = await Promise.all(
// // items.map(async item => [item[0], await item[1]]),
// // );

// const filtered: any = items.filter(entry => {
// return entry[1] instanceof ZodError;
// });

// if (filtered.length > 0) {
// const allIssues = filtered.reduce(
// (acc: any[], val: [string, ZodError]) => {
// const error = val[1];
// return acc.concat(error.issues);
// },
// [],
// );
// const error = new ZodError(allIssues);
// // const base = filtered[0][1];
// // base.issues = all_issues;
// throw error;
// } else {
for (const item of items) {
value[item[0]] = item[1];
}

return value;
// }
};
return getAsyncObject();
} else {
const items = Object.keys(pps).map(k => {
try {
const v = pps[k].getValueSync();
return [k, v] as [string, any];
} catch (err) {
if (err instanceof ZodError) {
zerr.addIssues(err.issues);
return [k, INVALID] as [string, any];
}
throw err;
}
});
// let syncValue: any = {};
if (!zerr.isEmpty) throw zerr;
for (const item of items) {
value[item[0]] = item[1];
}
return value;
}
});
};

static resolve = <T>(value: T): PseudoPromise<T> => {
if (value instanceof PseudoPromise) {
throw new Error('Do not pass PseudoPromise into PseudoPromise.resolve');
}
return new PseudoPromise().then(() => value) as any;
};

then = <NewReturn>(
func: (arg: ReturnType, ctx: { async: boolean }) => NewReturn,
): PseudoPromise<NewReturn extends Promise<infer U> ? U : NewReturn> => {
return new PseudoPromise([
...this.items,
{ type: 'function', function: func },
]);
};

catch = <NewReturn>(
catcher: (err: Error, ctx: { async: boolean }) => NewReturn,
): PseudoPromise<NewReturn extends Promise<infer U> ? U : NewReturn> => {
return new PseudoPromise([...this.items, { type: 'catcher', catcher }]);
};

// getValue = (
// allowPromises: boolean = false,
// ): ReturnType | Promise<ReturnType> => {
// try {
// return this.getValueSync(allowPromises);
// } catch (err) {
// if (err.message === 'found_promise') {
// return this.getValueAsync();
// }
// throw err;
// }
// };

getValueSync = (): ReturnType => {
// // if (this._cached.value) return this._cached.value;
let val: any = undefined;

// for (const item of this.items) {
// if (item.type === 'function') {
// val = item.function(val, { async: false });
// }

// if (val instanceof Promise && allowPromises === false) {
// throw new Error('found_promise');
// }
// }
for (let index = 0; index < this.items.length; index++) {
try {
const item = this.items[index];

if (item.type === 'function') {
val = item.function(val, { async: false });
}
} catch (err) {
const catcherIndex = this.items.findIndex(
(x, i) => x.type === 'catcher' && i > index,
);

const catcherItem = this.items[catcherIndex];
if (!catcherItem || catcherItem.type !== 'catcher') {
throw err;
} else {
val = catcherItem.catcher(err, { async: false });
index = catcherIndex;
}
}

// if (val instanceof PseudoPromise) {
// throw new Error('SYNC: DO NOT RETURN PSEUDOPROMISE FROM FUNCTIONS');
// }
// if (val instanceof Promise) {
// throw new Error('SYNC: DO NOT RETURN PROMISE FROM FUNCTIONS');
// }

// while (!!val.then) {
// if (val instanceof PseudoPromise) {
// val = await val.toPromise();
// } else {
// val = await val;
// }
// }
}
// this._cached.value = val;
return val;
};

getValueAsync = async (): Promise<ReturnType> => {
// // if (this._cached.value) return this._cached.value;
let val: any = undefined;

for (let index = 0; index < this.items.length; index++) {
const item = this.items[index];
try {
if (item.type === 'function') {
val = await item.function(val, { async: true });
}
} catch (err) {
const catcherIndex = this.items.findIndex(
(x, i) => x.type === 'catcher' && i > index,
);

const catcherItem = this.items[catcherIndex];

if (!catcherItem || catcherItem.type !== 'catcher') {
throw err;
} else {
index = catcherIndex;
val = await catcherItem.catcher(err, { async: true });
}
}

if (val instanceof PseudoPromise) {
throw new Error('ASYNC: DO NOT RETURN PSEUDOPROMISE FROM FUNCTIONS');
}
if (val instanceof Promise) {
throw new Error('ASYNC: DO NOT RETURN PROMISE FROM FUNCTIONS');
}
// while (!!val.then) {
// if (val instanceof PseudoPromise) {
// val = await val.toPromise();
// } else {
// val = await val;
// }
// }
}
// this._cached.value = val;
return val;
};
}
Loading